From 924f7e35654c6ebe2db5b51149e11a5f1c08aeb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Mino?= Date: Mon, 28 Sep 2020 00:07:08 +0200 Subject: [PATCH 0001/1179] Start working on Spring Boot 2.4 upgrade --- generators/generator-constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generator-constants.js b/generators/generator-constants.js index 5c69551ac59a..975435066d5f 100644 --- a/generators/generator-constants.js +++ b/generators/generator-constants.js @@ -32,7 +32,7 @@ const JIB_VERSION = '2.5.0'; // Libraries version const JHIPSTER_DEPENDENCIES_VERSION = '3.10.0-SNAPSHOT'; // The spring-boot version should match the one managed by https://mvnrepository.com/artifact/io.github.jhipster/jhipster-dependencies/JHIPSTER_DEPENDENCIES_VERSION -const SPRING_BOOT_VERSION = '2.3.4.RELEASE'; +const SPRING_BOOT_VERSION = '2.4.0-M3'; const LIQUIBASE_VERSION = '3.10.2'; const liquibaseSemVer = semver.parse(LIQUIBASE_VERSION); const LIQUIBASE_DTD_VERSION = `${liquibaseSemVer.major}.${liquibaseSemVer.minor}`; From b5631a0514218d3ccf5c153bd0d696895d68a461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Mino?= Date: Mon, 28 Sep 2020 00:08:38 +0200 Subject: [PATCH 0002/1179] CI: switch JHI_LIB_BRANCH to spring-boot-2.4 branch --- .github/workflows/angular.yml | 2 +- .github/workflows/incremental-changelog.yml | 2 +- .github/workflows/react.yml | 2 +- .github/workflows/vue.yml | 2 +- .github/workflows/webflux.yml | 2 +- azure-pipelines.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index d6976341a375..632c8636b535 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -37,7 +37,7 @@ env: JHI_RUN_APP: 1 JHI_JDK: 11 JHI_LIB_REPO: https://github.com/jhipster/jhipster.git - JHI_LIB_BRANCH: master + JHI_LIB_BRANCH: spring-boot-2.4 JHI_GEN_REPO: https://github.com/jhipster/generator-jhipster.git JHI_GEN_BRANCH: master SPRING_OUTPUT_ANSI_ENABLED: ALWAYS diff --git a/.github/workflows/incremental-changelog.yml b/.github/workflows/incremental-changelog.yml index 32a18089cdca..679590a3b280 100644 --- a/.github/workflows/incremental-changelog.yml +++ b/.github/workflows/incremental-changelog.yml @@ -36,7 +36,7 @@ env: JHI_RUN_APP: 1 JHI_JDK: 11 JHI_LIB_REPO: https://github.com/jhipster/jhipster.git - JHI_LIB_BRANCH: master + JHI_LIB_BRANCH: spring-boot-2.4 JHI_GEN_REPO: https://github.com/jhipster/generator-jhipster.git JHI_GEN_BRANCH: master SPRING_OUTPUT_ANSI_ENABLED: ALWAYS diff --git a/.github/workflows/react.yml b/.github/workflows/react.yml index c8a23c5a0460..089aa3270870 100644 --- a/.github/workflows/react.yml +++ b/.github/workflows/react.yml @@ -37,7 +37,7 @@ env: JHI_RUN_APP: 1 JHI_JDK: 11 JHI_LIB_REPO: https://github.com/jhipster/jhipster.git - JHI_LIB_BRANCH: master + JHI_LIB_BRANCH: spring-boot-2.4 JHI_GEN_REPO: https://github.com/jhipster/generator-jhipster.git JHI_GEN_BRANCH: master SPRING_OUTPUT_ANSI_ENABLED: ALWAYS diff --git a/.github/workflows/vue.yml b/.github/workflows/vue.yml index 560aa628951a..123ff8c971dc 100644 --- a/.github/workflows/vue.yml +++ b/.github/workflows/vue.yml @@ -37,7 +37,7 @@ env: JHI_RUN_APP: 1 JHI_JDK: 11 JHI_LIB_REPO: https://github.com/jhipster/jhipster.git - JHI_LIB_BRANCH: master + JHI_LIB_BRANCH: spring-boot-2.4 JHI_GEN_REPO: https://github.com/jhipster/generator-jhipster.git JHI_GEN_BRANCH: master SPRING_OUTPUT_ANSI_ENABLED: ALWAYS diff --git a/.github/workflows/webflux.yml b/.github/workflows/webflux.yml index fd49863b8979..decd9edc54c7 100644 --- a/.github/workflows/webflux.yml +++ b/.github/workflows/webflux.yml @@ -30,7 +30,7 @@ env: JHI_RUN_APP: 1 JHI_JDK: 11 JHI_LIB_REPO: https://github.com/jhipster/jhipster.git - JHI_LIB_BRANCH: master + JHI_LIB_BRANCH: spring-boot-2.4 JHI_GEN_REPO: https://github.com/jhipster/generator-jhipster.git JHI_GEN_BRANCH: master SPRING_OUTPUT_ANSI_ENABLED: ALWAYS diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9473c32f723d..2e32bad27333 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -32,7 +32,7 @@ jobs: JHI_JDK: 11 # if JHI_LIB_BRANCH value is release, use the release from Maven JHI_LIB_REPO: https://github.com/jhipster/jhipster.git - JHI_LIB_BRANCH: master + JHI_LIB_BRANCH: spring-boot-2.4 # if JHI_GEN_BRANCH value is release, use the release from NPM JHI_GEN_REPO: https://github.com/jhipster/generator-jhipster.git JHI_GEN_BRANCH: master From 934a5f1faf5e0ca037c00142d0c9ca52ead413e8 Mon Sep 17 00:00:00 2001 From: Theo LEBRUN Date: Wed, 30 Sep 2020 04:12:24 -0400 Subject: [PATCH 0003/1179] Add custom claim converter --- generators/server/files.js | 22 +++++ .../config/SecurityConfiguration.java.ejs | 10 ++- .../oauth2/CustomClaimConverter.java.ejs | 90 +++++++++++++++++++ .../oauth2/CustomClaimConverterIT.java.ejs | 90 +++++++++++++++++++ 4 files changed, 211 insertions(+), 1 deletion(-) create mode 100644 generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs create mode 100644 generators/server/templates/src/test/java/package/security/oauth2/CustomClaimConverterIT.java.ejs diff --git a/generators/server/files.js b/generators/server/files.js index 834b0ddc116a..5b1441dd6499 100644 --- a/generators/server/files.js +++ b/generators/server/files.js @@ -893,6 +893,28 @@ const serverFiles = { templates: ['config/bootstrap.yml', 'config/bootstrap-prod.yml'], }, ], + serverMicroserviceAndOauth: [ + { + condition: generator => generator.authenticationType === 'oauth2' && generator.applicationType === 'microservice', + path: SERVER_MAIN_SRC_DIR, + templates: [ + { + file: 'package/security/oauth2/CustomClaimConverter.java', + renameTo: generator => `${generator.javaDir}security/oauth2/CustomClaimConverter.java` + } + ] + }, + { + condition: generator => generator.authenticationType === 'oauth2' && generator.applicationType === 'microservice', + path: SERVER_TEST_SRC_DIR, + templates: [ + { + file: 'package/security/oauth2/CustomClaimConverterIT.java', + renameTo: generator => `${generator.javaDir}security/oauth2/CustomClaimConverterIT.java` + } + ] + } + ], serverJavaApp: [ { path: SERVER_MAIN_SRC_DIR, diff --git a/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs index b54cb98bfd27..d19d32dd3b7c 100644 --- a/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs @@ -97,6 +97,11 @@ import <%= packageName %>.security.oauth2.JwtGrantedAuthorityConverter; <%_ if (authenticationType === 'jwt' && applicationType !== 'microservice') { _%> import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; <%_ } _%> + <%_ if (authenticationType === 'oauth2' && applicationType === 'microservice') { _%> +import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; +import org.springframework.web.client.RestTemplate; +import <%= packageName %>.security.oauth2.CustomClaimConverter; + <%_ } _%> import org.springframework.security.web.header.writers.ReferrerPolicyHeaderWriter; <%_ if (applicationType !== 'microservice') { _%> import org.springframework.web.filter.CorsFilter; @@ -341,7 +346,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { <%_ } _%> @Bean - JwtDecoder jwtDecoder() { + JwtDecoder jwtDecoder(<%_ if (authenticationType === 'oauth2' && applicationType === 'microservice') { _%>ClientRegistrationRepository clientRegistrationRepository<%_ } _%>) { NimbusJwtDecoder jwtDecoder = (NimbusJwtDecoder) JwtDecoders.fromOidcIssuerLocation(issuerUri); OAuth2TokenValidator audienceValidator = new AudienceValidator(jHipsterProperties.getSecurity().getOauth2().getAudience()); @@ -349,6 +354,9 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { OAuth2TokenValidator withAudience = new DelegatingOAuth2TokenValidator<>(withIssuer, audienceValidator); jwtDecoder.setJwtValidator(withAudience); + <%_ if (authenticationType === 'oauth2' && applicationType === 'microservice') { _%> + jwtDecoder.setClaimSetConverter(new CustomClaimConverter(clientRegistrationRepository.findByRegistrationId("oidc"), new RestTemplate())); + <%_ } _%> return jwtDecoder; } diff --git a/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs new file mode 100644 index 000000000000..8f288b4b456f --- /dev/null +++ b/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs @@ -0,0 +1,90 @@ +<%# + Copyright 2013-2020 the original author or authors from the JHipster project. + + 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 "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 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-%> +package <%= packageName %>.security.oauth2; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.springframework.core.convert.converter.Converter; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; +import org.springframework.security.oauth2.client.registration.ClientRegistration; +import org.springframework.security.oauth2.jwt.MappedJwtClaimSetConverter; +import org.springframework.security.oauth2.server.resource.web.BearerTokenResolver; +import org.springframework.security.oauth2.server.resource.web.DefaultBearerTokenResolver; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; + +/** + * Claim converter to add custom claims by retrieving the user from the userinfo endpoint. + */ +public class CustomClaimConverter implements Converter, Map> { + private final BearerTokenResolver bearerTokenResolver = new DefaultBearerTokenResolver(); + + private final MappedJwtClaimSetConverter delegate = MappedJwtClaimSetConverter.withDefaults(Collections.emptyMap()); + + private final RestTemplate restTemplate; + + private final ClientRegistration registration; + + private final Map users = new HashMap<>(); + + public CustomClaimConverter(ClientRegistration registration, RestTemplate restTemplate) { + this.registration = registration; + this.restTemplate = restTemplate; + } + + public Map convert(Map claims) { + Map convertedClaims = this.delegate.convert(claims); + if (RequestContextHolder.getRequestAttributes() != null) { + // Retrieve and set the token + String token = bearerTokenResolver.resolve(((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); + HttpHeaders headers = new HttpHeaders() {{ + set("Authorization", "Bearer " + token); + }}; + + // Retrieve user infos from OAuth provider if not already loaded + ObjectNode user = users.computeIfAbsent(claims.get("sub").toString(), s -> { + ResponseEntity userInfo = restTemplate.exchange(registration.getProviderDetails().getUserInfoEndpoint().getUri(), HttpMethod.GET, new HttpEntity(headers), ObjectNode.class); + return userInfo.getBody(); + }); + + // Add custom claims + if (user != null) { + convertedClaims.put("preferred_username", user.get("preferred_username").asText()); + convertedClaims.put("given_name", user.get("given_name").asText()); + convertedClaims.put("family_name", user.get("family_name").asText()); + List groups = StreamSupport.stream(user.get("groups").spliterator(), false) + .map(JsonNode::asText) + .collect(Collectors.toList()); + convertedClaims.put("groups", groups); + } + } + return convertedClaims; + } +} diff --git a/generators/server/templates/src/test/java/package/security/oauth2/CustomClaimConverterIT.java.ejs b/generators/server/templates/src/test/java/package/security/oauth2/CustomClaimConverterIT.java.ejs new file mode 100644 index 000000000000..4dce1caae52d --- /dev/null +++ b/generators/server/templates/src/test/java/package/security/oauth2/CustomClaimConverterIT.java.ejs @@ -0,0 +1,90 @@ +<%# + Copyright 2013-2020 the original author or authors from the JHipster project. + + 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 "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 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-%> +package <%= packageName %>.security.oauth2; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import <%= packageName %>.<%= mainClass %>; +import <%= packageName %>.config.TestSecurityConfiguration; +import <%= packageName %>.security.AuthoritiesConstants; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentMatchers; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; +import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.client.RestTemplate; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.when; + +@SpringBootTest(classes = {<%= mainClass %>.class, TestSecurityConfiguration.class}) +@ExtendWith(MockitoExtension.class) +public class CustomClaimConverterIT { + private static final String USERNAME = "admin"; + private static final String NAME = "John"; + private static final String FAMILY_NAME = "Doe"; + + @Mock + private RestTemplate restTemplate; + + @Autowired + private ClientRegistrationRepository clientRegistrationRepository; + + private CustomClaimConverter customClaimConverter; + + @BeforeEach + public void initTest() { + customClaimConverter = new CustomClaimConverter(clientRegistrationRepository.findByRegistrationId("oidc"), restTemplate); + ObjectMapper mapper = new ObjectMapper(); + ObjectNode user = mapper.createObjectNode(); + user.put("preferred_username", USERNAME); + user.put("given_name", NAME); + user.put("family_name", FAMILY_NAME); + user.putArray("groups").add(AuthoritiesConstants.ADMIN).add(AuthoritiesConstants.USER); + ResponseEntity userInfo = ResponseEntity.ok(user); + when(restTemplate.exchange(eq("https://api.jhipster.org/user"), eq(HttpMethod.GET), any(HttpEntity.class), ArgumentMatchers.>any())).thenReturn(userInfo); + } + + @Test + @Transactional + public void testConvert() { + Map claims = new HashMap<>(); + claims.put("sub", "123"); + Map convertedClaims = customClaimConverter.convert(claims); + + assertThat(convertedClaims.get("preferred_username")).isEqualTo(USERNAME); + assertThat(convertedClaims.get("given_name")).isEqualTo(NAME); + assertThat(convertedClaims.get("family_name")).isEqualTo(FAMILY_NAME); + assertThat(convertedClaims.get("groups")).isEqualTo(List.of(AuthoritiesConstants.ADMIN, AuthoritiesConstants.USER)); + } +} From 1732a852cb29d8be0549afe1e7f52a2dec587107 Mon Sep 17 00:00:00 2001 From: Theo LEBRUN Date: Wed, 30 Sep 2020 04:24:52 -0400 Subject: [PATCH 0004/1179] Prettier --- generators/server/files.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/generators/server/files.js b/generators/server/files.js index 5b1441dd6499..2e842f59e642 100644 --- a/generators/server/files.js +++ b/generators/server/files.js @@ -900,9 +900,9 @@ const serverFiles = { templates: [ { file: 'package/security/oauth2/CustomClaimConverter.java', - renameTo: generator => `${generator.javaDir}security/oauth2/CustomClaimConverter.java` - } - ] + renameTo: generator => `${generator.javaDir}security/oauth2/CustomClaimConverter.java`, + }, + ], }, { condition: generator => generator.authenticationType === 'oauth2' && generator.applicationType === 'microservice', @@ -910,10 +910,10 @@ const serverFiles = { templates: [ { file: 'package/security/oauth2/CustomClaimConverterIT.java', - renameTo: generator => `${generator.javaDir}security/oauth2/CustomClaimConverterIT.java` - } - ] - } + renameTo: generator => `${generator.javaDir}security/oauth2/CustomClaimConverterIT.java`, + }, + ], + }, ], serverJavaApp: [ { From 0e0b3e55b019a997b7ae4645565f8553790b4783 Mon Sep 17 00:00:00 2001 From: Theo LEBRUN Date: Wed, 30 Sep 2020 16:58:05 -0400 Subject: [PATCH 0005/1179] Do not add the files for a reactive project --- generators/server/files.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/generators/server/files.js b/generators/server/files.js index 2e842f59e642..ef6f1000a8e6 100644 --- a/generators/server/files.js +++ b/generators/server/files.js @@ -895,7 +895,8 @@ const serverFiles = { ], serverMicroserviceAndOauth: [ { - condition: generator => generator.authenticationType === 'oauth2' && generator.applicationType === 'microservice', + condition: generator => + !generator.reactive && generator.authenticationType === 'oauth2' && generator.applicationType === 'microservice', path: SERVER_MAIN_SRC_DIR, templates: [ { @@ -905,7 +906,8 @@ const serverFiles = { ], }, { - condition: generator => generator.authenticationType === 'oauth2' && generator.applicationType === 'microservice', + condition: generator => + !generator.reactive && generator.authenticationType === 'oauth2' && generator.applicationType === 'microservice', path: SERVER_TEST_SRC_DIR, templates: [ { From b127e2ec6a128b74e64b2a5e6e0727b742ec0383 Mon Sep 17 00:00:00 2001 From: Mathieu Abou-Aichi Date: Sun, 15 Nov 2020 10:59:57 +0100 Subject: [PATCH 0006/1179] Converted uppercase-first JDL annotations to lowercase-first ones --- .../parsed-jdl-to-jdl-object-converter.js | 20 +-- ...parsed-jdl-to-jdl-object-converter.spec.js | 129 ++++++++++++------ .../test-files/capitalized_annotations.jdl | 26 ++++ 3 files changed, 126 insertions(+), 49 deletions(-) create mode 100644 test/jdl/test-files/capitalized_annotations.jdl diff --git a/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js b/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js index d63e7982fd44..f6ce6007e18d 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js +++ b/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +const _ = require('lodash'); const JDLObject = require('../../models/jdl-object'); const JDLEntity = require('../../models/jdl-entity'); const JDLUnaryOption = require('../../models/jdl-unary-option'); @@ -139,20 +139,21 @@ function addOptionsFromEntityAnnotations() { const entityName = entity.name; const annotations = entity.annotations; annotations.forEach(annotation => { + let annotationName = _.lowerFirst(annotation.optionName); if (annotation.type === 'UNARY') { jdlObject.addOption( new JDLUnaryOption({ - name: annotation.optionName, + name: annotationName, entityNames: [entityName], }) ); } else if (annotation.type === 'BINARY') { - if (annotation.optionName === 'paginate') { - annotation.optionName = BinaryOptions.Options.PAGINATION; + if (annotationName === 'paginate') { + annotationName = BinaryOptions.Options.PAGINATION; } jdlObject.addOption( new JDLBinaryOption({ - name: annotation.optionName, + name: annotationName, value: annotation.optionValue, entityNames: [entityName], }) @@ -207,18 +208,19 @@ function fillAssociations() { function convertAnnotationsToOptions(annotations) { const result = {}; annotations.forEach(annotation => { + const annotationName = _.lowerFirst(annotation.optionName); const value = annotation.optionValue ? annotation.optionValue : true; - if (annotation.optionName in result) { - const previousValue = result[annotation.optionName]; + if (annotationName in result) { + const previousValue = result[annotationName]; if (Array.isArray(previousValue)) { if (!previousValue.includes(value)) { previousValue.push(value); } } else if (value !== previousValue) { - result[annotation.optionName] = [previousValue, value]; + result[annotationName] = [previousValue, value]; } } else { - result[annotation.optionName] = value; + result[annotationName] = value; } }); return result; diff --git a/test/jdl/converters/parsedJDLToJDLObject/parsed-jdl-to-jdl-object-converter.spec.js b/test/jdl/converters/parsedJDLToJDLObject/parsed-jdl-to-jdl-object-converter.spec.js index 11c256ba7a38..8517fde15cff 100644 --- a/test/jdl/converters/parsedJDLToJDLObject/parsed-jdl-to-jdl-object-converter.spec.js +++ b/test/jdl/converters/parsedJDLToJDLObject/parsed-jdl-to-jdl-object-converter.spec.js @@ -698,48 +698,97 @@ describe('ParsedJDLToJDLObjectConverter', () => { }); }); context('when parsing entities with annotations', () => { - let dtoOption; - let filterOption; - let paginationOption; - let serviceOption; - let skipClientOption; - let customUnaryOption; - let customBinaryOption; - let customBinaryOption2; - let fieldAnnotation; - let relationshipAnnotation; + context('that are not capitalized', () => { + let dtoOption; + let filterOption; + let paginationOption; + let serviceOption; + let skipClientOption; + let customUnaryOption; + let customBinaryOption; + let customBinaryOption2; + let fieldAnnotation; + let relationshipAnnotation; - before(() => { - const input = JDLReader.parseFromFiles([path.join(__dirname, '..', '..', 'test-files', 'annotations.jdl')]); - const jdlObject = ParsedJDLToJDLObjectConverter.parseFromConfigurationObject({ - parsedContent: input, - applicationType: ApplicationTypes.MONOLITH, + before(() => { + const input = JDLReader.parseFromFiles([path.join(__dirname, '..', '..', 'test-files', 'annotations.jdl')]); + const jdlObject = ParsedJDLToJDLObjectConverter.parseFromConfigurationObject({ + parsedContent: input, + applicationType: ApplicationTypes.MONOLITH, + }); + dtoOption = jdlObject.getOptionsForName(BinaryOptions.DTO)[0]; + filterOption = jdlObject.getOptionsForName(UnaryOptions.FILTER)[0]; + paginationOption = jdlObject.getOptionsForName(BinaryOptions.PAGINATION)[0]; + serviceOption = jdlObject.getOptionsForName(BinaryOptions.SERVICE)[0]; + skipClientOption = jdlObject.getOptionsForName(UnaryOptions.SKIP_CLIENT)[0]; + customUnaryOption = jdlObject.getOptionsForName('myCustomUnaryOption')[0]; + customBinaryOption = jdlObject.getOptionsForName('myCustomBinaryOption')[0]; + customBinaryOption2 = jdlObject.getOptionsForName('myCustomBinaryOption')[1]; + fieldAnnotation = jdlObject.entities.A.fields.name.options.id; + relationshipAnnotation = jdlObject.relationships.getOneToMany('OneToMany_A{b}_B{a}').options.id; + }); + + it('should set the annotations as options', () => { + expect(dtoOption.entityNames).to.deep.equal(new Set(['A', 'B'])); + expect(filterOption.entityNames).to.deep.equal(new Set(['C'])); + expect(paginationOption.entityNames).to.deep.equal(new Set(['B', 'C'])); + expect(serviceOption.entityNames).to.deep.equal(new Set(['A', 'B'])); + expect(skipClientOption.entityNames).to.deep.equal(new Set(['A', 'C'])); + expect(customUnaryOption.entityNames).to.deep.equal(new Set(['A', 'B'])); + expect(customBinaryOption.entityNames).to.deep.equal(new Set(['A'])); + expect(customBinaryOption2.entityNames).to.deep.equal(new Set(['C'])); + expect(customBinaryOption.value).to.deep.equal('customValue'); + expect(customBinaryOption2.value).to.deep.equal('customValue2'); + expect(fieldAnnotation).to.deep.equal(true); + expect(relationshipAnnotation).to.deep.equal(true); + }); + }); + context('that are capitalized', () => { + let dtoOption; + let filterOption; + let paginationOption; + let serviceOption; + let skipClientOption; + let customUnaryOption; + let customBinaryOption; + let customBinaryOption2; + let fieldAnnotation; + let relationshipAnnotation; + + before(() => { + const input = JDLReader.parseFromFiles([ + path.join(__dirname, '..', '..', 'test-files', 'capitalized_annotations.jdl'), + ]); + const jdlObject = ParsedJDLToJDLObjectConverter.parseFromConfigurationObject({ + parsedContent: input, + applicationType: ApplicationTypes.MONOLITH, + }); + dtoOption = jdlObject.getOptionsForName(BinaryOptions.DTO)[0]; + filterOption = jdlObject.getOptionsForName(UnaryOptions.FILTER)[0]; + paginationOption = jdlObject.getOptionsForName(BinaryOptions.PAGINATION)[0]; + serviceOption = jdlObject.getOptionsForName(BinaryOptions.SERVICE)[0]; + skipClientOption = jdlObject.getOptionsForName(UnaryOptions.SKIP_CLIENT)[0]; + customUnaryOption = jdlObject.getOptionsForName('myCustomUnaryOption')[0]; + customBinaryOption = jdlObject.getOptionsForName('myCustomBinaryOption')[0]; + customBinaryOption2 = jdlObject.getOptionsForName('myCustomBinaryOption')[1]; + fieldAnnotation = jdlObject.entities.A.fields.name.options.id; + relationshipAnnotation = jdlObject.relationships.getOneToMany('OneToMany_A{b}_B{a}').options.id; + }); + + it('should set the annotations as options with lower-case letters first', () => { + expect(dtoOption.entityNames).to.deep.equal(new Set(['A', 'B'])); + expect(filterOption.entityNames).to.deep.equal(new Set(['C'])); + expect(paginationOption.entityNames).to.deep.equal(new Set(['B', 'C'])); + expect(serviceOption.entityNames).to.deep.equal(new Set(['A', 'B'])); + expect(skipClientOption.entityNames).to.deep.equal(new Set(['A', 'C'])); + expect(customUnaryOption.entityNames).to.deep.equal(new Set(['A', 'B'])); + expect(customBinaryOption.entityNames).to.deep.equal(new Set(['A'])); + expect(customBinaryOption2.entityNames).to.deep.equal(new Set(['C'])); + expect(customBinaryOption.value).to.deep.equal('customValue'); + expect(customBinaryOption2.value).to.deep.equal('customValue2'); + expect(fieldAnnotation).to.deep.equal(true); + expect(relationshipAnnotation).to.deep.equal(true); }); - dtoOption = jdlObject.getOptionsForName(BinaryOptions.DTO)[0]; - filterOption = jdlObject.getOptionsForName(UnaryOptions.FILTER)[0]; - paginationOption = jdlObject.getOptionsForName(BinaryOptions.PAGINATION)[0]; - serviceOption = jdlObject.getOptionsForName(BinaryOptions.SERVICE)[0]; - skipClientOption = jdlObject.getOptionsForName(UnaryOptions.SKIP_CLIENT)[0]; - customUnaryOption = jdlObject.getOptionsForName('myCustomUnaryOption')[0]; - customBinaryOption = jdlObject.getOptionsForName('myCustomBinaryOption')[0]; - customBinaryOption2 = jdlObject.getOptionsForName('myCustomBinaryOption')[1]; - fieldAnnotation = jdlObject.entities.A.fields.name.options.id; - relationshipAnnotation = jdlObject.relationships.getOneToMany('OneToMany_A{b}_B{a}').options.id; - }); - - it('should set the annotations as options', () => { - expect(dtoOption.entityNames).to.deep.equal(new Set(['A', 'B'])); - expect(filterOption.entityNames).to.deep.equal(new Set(['C'])); - expect(paginationOption.entityNames).to.deep.equal(new Set(['B', 'C'])); - expect(serviceOption.entityNames).to.deep.equal(new Set(['A', 'B'])); - expect(skipClientOption.entityNames).to.deep.equal(new Set(['A', 'C'])); - expect(customUnaryOption.entityNames).to.deep.equal(new Set(['A', 'B'])); - expect(customBinaryOption.entityNames).to.deep.equal(new Set(['A'])); - expect(customBinaryOption2.entityNames).to.deep.equal(new Set(['C'])); - expect(customBinaryOption.value).to.deep.equal('customValue'); - expect(customBinaryOption2.value).to.deep.equal('customValue2'); - expect(fieldAnnotation).to.deep.equal(true); - expect(relationshipAnnotation).to.deep.equal(true); }); }); context('when parsing a mix between annotations and regular options', () => { diff --git a/test/jdl/test-files/capitalized_annotations.jdl b/test/jdl/test-files/capitalized_annotations.jdl new file mode 100644 index 000000000000..ba09d074fb2b --- /dev/null +++ b/test/jdl/test-files/capitalized_annotations.jdl @@ -0,0 +1,26 @@ +@Service(serviceClass) +@Dto(mapstruct) +@SkipClient +@MyCustomUnaryOption +@MyCustomBinaryOption(customValue) +@MyCustomBinaryOption(customValue) +entity A { + @Id @MultiValue(value1) @MultiValue(value2) @MultiValue(value3) name String + noAnnotation String +} + +@Paginate(pagination) +@Dto(mapstruct) +@Service(serviceClass) +@MyCustomUnaryOption +entity B + +@SkipClient +@Filter +@Paginate(pagination) +@MyCustomBinaryOption(customValue2) +entity C + +relationship OneToMany { + @Id A{b required} to B{a} +} From 098aac4fdffa2b6b9b27a059d50ab2495394d996 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Mon, 16 Nov 2020 15:27:38 -0300 Subject: [PATCH 0007/1179] Change github actions caching --- .github/workflows/angular.yml | 28 ++++++++++++++++++++-------- .github/workflows/react.yml | 34 +++++++++++++++++++++++----------- .github/workflows/vue.yml | 28 ++++++++++++++++++++-------- .github/workflows/webflux.yml | 28 ++++++++++++++++++++-------- 4 files changed, 83 insertions(+), 35 deletions(-) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index 20c993168b3e..5982c352bcde 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -19,6 +19,8 @@ name: Angular on: + schedule: + - cron: '0 0 * * *' push: branches-ignore: - 'dependabot/**' @@ -74,6 +76,7 @@ jobs: matrix: node_version: [14.15.0] os: [ubuntu-20.04] + cache: [angular] app-type: - ngx-default - ngx-mysql-es-noi18n-mapsid @@ -183,16 +186,25 @@ jobs: uses: actions/cache@v2 with: path: ~/.npm - key: ${{ runner.os }}-node-${{ matrix.app-type }}-${{ steps.get-date.outputs.date }}-${{ hashFiles('generator-jhipster/package-lock.json', 'generator-jhipster/**/package.json.ejs') }} + key: ${{ runner.os }}-node-${{ matrix.cache }}-${{ steps.get-date.outputs.date }}-${{ hashFiles('generator-jhipster/package-lock.json', 'generator-jhipster/**/package.json.ejs') }} restore-keys: | - ${{ runner.os }}-node-${{ matrix.app-type }}-${{ steps.get-date.outputs.date }}- + ${{ runner.os }}-node-${{ matrix.cache }}-${{ steps.get-date.outputs.date }}- - name: 'SETUP: load maven cache' + if: "!contains(matrix.app-type, 'gradle')" uses: actions/cache@v2 with: path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ matrix.app-type }}-${{ steps.get-date.outputs.date }}-${{ hashFiles('generator-jhipster/**/pom.xml.ejs') }} + key: ${{ runner.os }}-maven-${{ steps.get-date.outputs.date }}-${{ hashFiles('generator-jhipster/**/pom.xml.ejs') }} restore-keys: | - ${{ runner.os }}-maven-${{ matrix.app-type }}-${{ steps.get-date.outputs.date }}- + ${{ runner.os }}-maven-${{ steps.get-date.outputs.date }}- + - name: 'SETUP: load jhipster-bom maven cache' + if: contains(matrix.app-type, 'gradle') + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-jhipster-bom-${{ steps.get-date.outputs.date }}- + restore-keys: | + ${{ runner.os }}-maven-jhipster-bom- - name: 'SETUP: load gradle cache' if: contains(matrix.app-type, 'gradle') uses: actions/cache@v2 @@ -200,17 +212,17 @@ jobs: path: | ~/.gradle/caches ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ matrix.app-type }}-${{ hashFiles('generator-jhipster/**/build.gradle.ejs') }} + key: ${{ runner.os }}-gradle-${{ hashFiles('generator-jhipster/**/build.gradle.ejs') }} restore-keys: | - ${{ runner.os }}-gradle-${{ matrix.app-type }}- + ${{ runner.os }}-gradle- - name: 'SETUP: load e2e cache' if: matrix.e2e == 1 uses: actions/cache@v2 with: path: ~/.cache/Cypress/ - key: ${{ runner.os }}-e2e-${{ matrix.app-type }}-${{ hashFiles('generator-jhipster/**/package.json.ejs') }} + key: ${{ runner.os }}-cypress-${{ hashFiles('generator-jhipster/client/common/package.json') }} restore-keys: | - ${{ runner.os }}-e2e-${{ matrix.app-type }}- + ${{ runner.os }}-cypress- - name: 'ENV: display variables' run: $JHI_SCRIPTS/01-display-configuration.sh - name: 'TOOLS: configure tools installed by the system' diff --git a/.github/workflows/react.yml b/.github/workflows/react.yml index 27189910e939..f6a2747dff59 100644 --- a/.github/workflows/react.yml +++ b/.github/workflows/react.yml @@ -19,6 +19,8 @@ name: React on: + schedule: + - cron: '0 0 * * *' push: branches-ignore: - 'dependabot/**' @@ -74,6 +76,7 @@ jobs: matrix: node_version: [14.15.0] os: [ubuntu-20.04] + cache: [react] app-type: - react-default - react-maven-mysql-es-noi18n-mapsid @@ -176,16 +179,25 @@ jobs: uses: actions/cache@v2 with: path: ~/.npm - key: ${{ runner.os }}-node-${{ matrix.app-type }}-${{ steps.get-date.outputs.date }}-${{ hashFiles('generator-jhipster/package-lock.json', 'generator-jhipster/**/package.json.ejs') }} + key: ${{ runner.os }}-node-${{ matrix.cache }}-${{ steps.get-date.outputs.date }}-${{ hashFiles('generator-jhipster/package-lock.json', 'generator-jhipster/**/package.json.ejs') }} restore-keys: | - ${{ runner.os }}-node-${{ matrix.app-type }}-${{ steps.get-date.outputs.date }}- + ${{ runner.os }}-node-${{ matrix.cache }}-${{ steps.get-date.outputs.date }}- - name: 'SETUP: load maven cache' + if: "!contains(matrix.app-type, 'gradle')" uses: actions/cache@v2 with: path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ matrix.app-type }}-${{ steps.get-date.outputs.date }}-${{ hashFiles('generator-jhipster/**/pom.xml.ejs') }} + key: ${{ runner.os }}-maven-${{ steps.get-date.outputs.date }}-${{ hashFiles('generator-jhipster/**/pom.xml.ejs') }} restore-keys: | - ${{ runner.os }}-maven-${{ matrix.app-type }}-${{ steps.get-date.outputs.date }}- + ${{ runner.os }}-maven-${{ steps.get-date.outputs.date }}- + - name: 'SETUP: load jhipster-bom maven cache' + if: contains(matrix.app-type, 'gradle') + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-jhipster-bom-${{ steps.get-date.outputs.date }}- + restore-keys: | + ${{ runner.os }}-maven-jhipster-bom- - name: 'SETUP: load gradle cache' if: contains(matrix.app-type, 'gradle') uses: actions/cache@v2 @@ -193,17 +205,17 @@ jobs: path: | ~/.gradle/caches ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ matrix.app-type }}-${{ hashFiles('generator-jhipster/**/build.gradle.ejs') }} + key: ${{ runner.os }}-gradle-${{ hashFiles('generator-jhipster/**/build.gradle.ejs') }} restore-keys: | - ${{ runner.os }}-gradle-${{ matrix.app-type }}- + ${{ runner.os }}-gradle- - name: 'SETUP: load e2e cache' if: matrix.e2e == 1 uses: actions/cache@v2 with: path: ~/.cache/Cypress/ - key: ${{ runner.os }}-e2e-${{ matrix.app-type }}-${{ hashFiles('generator-jhipster/**/package.json.ejs') }} + key: ${{ runner.os }}-cypress-${{ hashFiles('generator-jhipster/client/common/package.json') }} restore-keys: | - ${{ runner.os }}-e2e-${{ matrix.app-type }}- + ${{ runner.os }}-cypress- - name: 'ENV: display variables' run: $JHI_SCRIPTS/01-display-configuration.sh - name: 'TOOLS: configure tools installed by the system' @@ -311,15 +323,15 @@ jobs: id: e2e if: steps.tests-should-be-skipped.outputs.skip-tests != 'true' run: npm run ci:e2e:run --if-present + - name: 'E2E: Teardown' + if: always() && matrix.e2e == 1 && steps.tests-should-be-skipped.outputs.skip-tests != 'true' + run: npm run ci:e2e:teardown - name: 'BACKEND: Store failure logs' uses: actions/upload-artifact@v2 if: always() && steps.backend.outcome == 'failure' with: name: log-${{ matrix.app-type }} path: ${{ github.workspace }}/app/build/test-results/**/*.xml - - name: 'E2E: Teardown' - if: always() && matrix.e2e == 1 && steps.tests-should-be-skipped.outputs.skip-tests != 'true' - run: npm run ci:e2e:teardown - name: 'E2E: Store failure screenshots' uses: actions/upload-artifact@v2 if: always() && steps.e2e.outcome == 'failure' diff --git a/.github/workflows/vue.yml b/.github/workflows/vue.yml index cc5d85817e86..c03c21496bb1 100644 --- a/.github/workflows/vue.yml +++ b/.github/workflows/vue.yml @@ -19,6 +19,8 @@ name: Vue on: + schedule: + - cron: '0 0 * * *' push: branches-ignore: - 'dependabot/**' @@ -74,6 +76,7 @@ jobs: matrix: node_version: [14.15.0] os: [ubuntu-20.04] + cache: [vue] app-type: - vue-default - vue-noi18n @@ -174,16 +177,25 @@ jobs: uses: actions/cache@v2 with: path: ~/.npm - key: ${{ runner.os }}-node-${{ matrix.app-type }}-${{ steps.get-date.outputs.date }}-${{ hashFiles('generator-jhipster/package-lock.json', 'generator-jhipster/**/package.json.ejs') }} + key: ${{ runner.os }}-node-${{ matrix.cache }}-${{ steps.get-date.outputs.date }}-${{ hashFiles('generator-jhipster/package-lock.json', 'generator-jhipster/**/package.json.ejs') }} restore-keys: | - ${{ runner.os }}-node-${{ matrix.app-type }}-${{ steps.get-date.outputs.date }}- + ${{ runner.os }}-node-${{ matrix.cache }}-${{ steps.get-date.outputs.date }}- - name: 'SETUP: load maven cache' + if: "!contains(matrix.app-type, 'gradle')" uses: actions/cache@v2 with: path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ matrix.app-type }}-${{ steps.get-date.outputs.date }}-${{ hashFiles('generator-jhipster/**/pom.xml.ejs') }} + key: ${{ runner.os }}-maven-${{ steps.get-date.outputs.date }}-${{ hashFiles('generator-jhipster/**/pom.xml.ejs') }} restore-keys: | - ${{ runner.os }}-maven-${{ matrix.app-type }}-${{ steps.get-date.outputs.date }}- + ${{ runner.os }}-maven-${{ steps.get-date.outputs.date }}- + - name: 'SETUP: load jhipster-bom maven cache' + if: contains(matrix.app-type, 'gradle') + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-jhipster-bom-${{ steps.get-date.outputs.date }}- + restore-keys: | + ${{ runner.os }}-maven-jhipster-bom- - name: 'SETUP: load gradle cache' if: contains(matrix.app-type, 'gradle') uses: actions/cache@v2 @@ -191,17 +203,17 @@ jobs: path: | ~/.gradle/caches ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ matrix.app-type }}-${{ hashFiles('generator-jhipster/**/build.gradle.ejs') }} + key: ${{ runner.os }}-gradle-${{ hashFiles('generator-jhipster/**/build.gradle.ejs') }} restore-keys: | - ${{ runner.os }}-gradle-${{ matrix.app-type }}- + ${{ runner.os }}-gradle- - name: 'SETUP: load e2e cache' if: matrix.e2e == 1 uses: actions/cache@v2 with: path: ~/.cache/Cypress/ - key: ${{ runner.os }}-e2e-${{ matrix.app-type }}-${{ hashFiles('generator-jhipster/**/package.json.ejs') }} + key: ${{ runner.os }}-cypress-${{ hashFiles('generator-jhipster/client/common/package.json') }} restore-keys: | - ${{ runner.os }}-e2e-${{ matrix.app-type }}- + ${{ runner.os }}-cypress- - name: 'ENV: display variables' run: $JHI_SCRIPTS/01-display-configuration.sh - name: 'TOOLS: configure tools installed by the system' diff --git a/.github/workflows/webflux.yml b/.github/workflows/webflux.yml index 87ccb823a80b..b770746c8a16 100644 --- a/.github/workflows/webflux.yml +++ b/.github/workflows/webflux.yml @@ -19,6 +19,8 @@ name: Webflux on: + schedule: + - cron: '0 0 * * *' push: branches-ignore: - 'dependabot/**' @@ -73,6 +75,7 @@ jobs: matrix: node_version: [14.15.0] os: [ubuntu-20.04] + cache: [webflux] app-type: - webflux-mongodb - webflux-mongodb-es-session @@ -180,16 +183,25 @@ jobs: uses: actions/cache@v2 with: path: ~/.npm - key: ${{ runner.os }}-node-${{ matrix.app-type }}-${{ steps.get-date.outputs.date }}-${{ hashFiles('generator-jhipster/package-lock.json', 'generator-jhipster/**/package.json.ejs') }} + key: ${{ runner.os }}-node-${{ matrix.cache }}-${{ steps.get-date.outputs.date }}-${{ hashFiles('generator-jhipster/package-lock.json', 'generator-jhipster/**/package.json.ejs') }} restore-keys: | - ${{ runner.os }}-node-${{ matrix.app-type }}-${{ steps.get-date.outputs.date }}- + ${{ runner.os }}-node-${{ matrix.cache }}-${{ steps.get-date.outputs.date }}- - name: 'SETUP: load maven cache' + if: "!contains(matrix.app-type, 'gradle')" uses: actions/cache@v2 with: path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ matrix.app-type }}-${{ steps.get-date.outputs.date }}-${{ hashFiles('generator-jhipster/**/pom.xml.ejs') }} + key: ${{ runner.os }}-maven-${{ steps.get-date.outputs.date }}-${{ hashFiles('generator-jhipster/**/pom.xml.ejs') }} restore-keys: | - ${{ runner.os }}-maven-${{ matrix.app-type }}-${{ steps.get-date.outputs.date }}- + ${{ runner.os }}-maven-${{ steps.get-date.outputs.date }}- + - name: 'SETUP: load jhipster-bom maven cache' + if: contains(matrix.app-type, 'gradle') + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-jhipster-bom-${{ steps.get-date.outputs.date }}- + restore-keys: | + ${{ runner.os }}-maven-jhipster-bom- - name: 'SETUP: load gradle cache' if: contains(matrix.app-type, 'gradle') uses: actions/cache@v2 @@ -197,17 +209,17 @@ jobs: path: | ~/.gradle/caches ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ matrix.app-type }}-${{ hashFiles('generator-jhipster/**/build.gradle.ejs') }} + key: ${{ runner.os }}-gradle-${{ hashFiles('generator-jhipster/**/build.gradle.ejs') }} restore-keys: | - ${{ runner.os }}-gradle-${{ matrix.app-type }}- + ${{ runner.os }}-gradle- - name: 'SETUP: load e2e cache' if: matrix.e2e == 1 uses: actions/cache@v2 with: path: ~/.cache/Cypress/ - key: ${{ runner.os }}-e2e-${{ matrix.app-type }}-${{ hashFiles('generator-jhipster/**/package.json.ejs') }} + key: ${{ runner.os }}-cypress-${{ hashFiles('generator-jhipster/client/common/package.json') }} restore-keys: | - ${{ runner.os }}-e2e-${{ matrix.app-type }}- + ${{ runner.os }}-cypress- - name: 'ENV: display variables' run: $JHI_SCRIPTS/01-display-configuration.sh - name: 'TOOLS: configure tools installed by the system' From 3b7bc4bacc2a4acaf403c870dfb7e12fdb064727 Mon Sep 17 00:00:00 2001 From: evertude Date: Fri, 20 Nov 2020 02:27:30 +0100 Subject: [PATCH 0008/1179] neo4j add eager find all without pageable --- .../src/main/java/package/repository/EntityRepository.java.ejs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs b/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs index c4d1e0446a19..94a818923601 100644 --- a/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs @@ -122,6 +122,9 @@ public interface <%= entityClass %>Repository extends <% if (databaseType === 's @Query("MATCH (n:<%= asEntity(entityClass) %>)<-[]-(m) RETURN n,m") Page<<%= asEntity(entityClass) %>> findAllWithEagerRelationships(Pageable pageable); + @Query("MATCH (n:<%= asEntity(entityClass) %>)<-[]-(m) RETURN n,m") + List<<%= asEntity(entityClass) %>> findAllWithEagerRelationships(); + @Query("MATCH (e:<%= asEntity(entityClass) %> {id: $id}) RETURN e") Optional<<%= asEntity(entityClass) %>> findOneWithEagerRelationships(<%= primaryKeyType %> id); <%_ } From f9e52b174a53d8ac7d6686cf19a9ab30679f2979 Mon Sep 17 00:00:00 2001 From: evertude Date: Fri, 20 Nov 2020 05:04:25 +0100 Subject: [PATCH 0009/1179] neo4j find all with eager relationships uses outgoing instead of incoming relations --- .../main/java/package/repository/EntityRepository.java.ejs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs b/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs index 94a818923601..6cf573799bee 100644 --- a/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs @@ -119,10 +119,10 @@ public interface <%= entityClass %>Repository extends <% if (databaseType === 's <%_ } else if (databaseType === 'neo4j') { _%> - @Query("MATCH (n:<%= asEntity(entityClass) %>)<-[]-(m) RETURN n,m") + @Query("MATCH (n:<%= asEntity(entityClass) %>)-[]->(m) RETURN n,m") Page<<%= asEntity(entityClass) %>> findAllWithEagerRelationships(Pageable pageable); - @Query("MATCH (n:<%= asEntity(entityClass) %>)<-[]-(m) RETURN n,m") + @Query("MATCH (n:<%= asEntity(entityClass) %>)-[]->(m) RETURN n,m") List<<%= asEntity(entityClass) %>> findAllWithEagerRelationships(); @Query("MATCH (e:<%= asEntity(entityClass) %> {id: $id}) RETURN e") From fb5f4e472470f2ef6535725fd6c31e34ecce4601 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Thu, 12 Nov 2020 20:17:02 -0300 Subject: [PATCH 0010/1179] Add logger at unhandled rejection. --- cli/cli.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cli/cli.js b/cli/cli.js index cbfca5ee7e32..e7e786b2e8e5 100644 --- a/cli/cli.js +++ b/cli/cli.js @@ -18,10 +18,11 @@ */ const { runJHipster } = require('./program'); -const { done } = require('./utils'); +const { done, logger } = require('./utils'); module.exports = runJHipster().catch(done); process.on('unhandledRejection', up => { - throw up; + logger.error('Unhandled promise rejection at:'); + logger.fatal(up); }); From 5ae05d3764a62fec5f9c35fae8cf982f9d2b7fa5 Mon Sep 17 00:00:00 2001 From: Arnaud FREISMUTH Date: Tue, 17 Nov 2020 14:13:11 +0100 Subject: [PATCH 0011/1179] stub axios with sinon Fix #13066 --- .../app/account/account.service.spec.ts.ejs | 36 +++++++------ .../activate/activate.component.spec.ts.ejs | 19 ++++--- .../change-password.component.spec.ts.ejs | 25 +++++---- .../login-form.component.spec.ts.ejs | 45 ++++++++-------- .../app/account/login.service.spec.ts.ejs | 21 ++++---- .../register/register.component.spec.ts.ejs | 31 ++++++----- ...eset-password-finish.component.spec.ts.ejs | 30 +++++------ .../reset-password-init.component.spec.ts.ejs | 18 +++---- .../sessions/sessions.component.spec.ts.ejs | 36 ++++++------- .../settings/settings.component.spec.ts.ejs | 27 +++++----- .../configuration.component.spec.ts.ejs | 18 +++---- .../admin/health/health.component.spec.ts.ejs | 18 +++---- .../app/admin/logs/logs.component.spec.ts.ejs | 20 +++---- .../metrics/metrics.component.spec.ts.ejs | 16 +++--- .../tracker/tracker.component.spec.ts.ejs | 9 ++-- ...user-management-edit.component.spec.ts.ejs | 52 +++++++++---------- ...user-management-view.component.spec.ts.ejs | 13 +++-- .../user-management.component.spec.ts.ejs | 44 ++++++++-------- .../app/entities/entity.service.spec.ts.ejs | 40 +++++++------- 19 files changed, 252 insertions(+), 266 deletions(-) diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/account/account.service.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/account/account.service.spec.ts.ejs index 8e2dd08981c4..85d19d244659 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/account/account.service.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/account/account.service.spec.ts.ejs @@ -1,6 +1,8 @@ import { createLocalVue } from '@vue/test-utils'; import router from '@/router'; import axios from 'axios'; +import sinon from 'sinon'; + import AccountService from '@/account/account.service'; <%_ if (enableTranslation) { _%> import TranslationService from '@/locale/translation.service'; @@ -10,11 +12,10 @@ import TrackerService from '@/admin/tracker/tracker.service'; <%_ } _%> import * as config from '@/shared/config/config'; -const mockedAxios: any = axios; -jest.mock('axios', () => ({ - get: jest.fn(), - post: jest.fn() -})); +const axiosStub = { + get: sinon.stub(axios, 'get'), + post: sinon.stub(axios, 'post'), +}; <%_ if (authenticationType === 'session' || authenticationType === 'oauth2') { _%> const mockedCookie = { get: jest.fn(() => { return 'token'; }) }; <%_ } %> @@ -28,7 +29,7 @@ describe('Account Service test suite', () => { let accountService: AccountService; beforeEach(() => { - mockedAxios.get.mockReset(); + axiosStub.get.reset(); store = config.initVueXStore(localVue); <%_ if (enableTranslation) { _%> i18n = config.initI18N(localVue); @@ -36,14 +37,14 @@ describe('Account Service test suite', () => { }); it('should init service and do not retrieve account', async () => { - mockedAxios.get.mockReturnValue(Promise.resolve({ data: { 'display-ribbon-on-profiles': 'dev', activeProfiles : ['dev', 'test']}})); + axiosStub.get.resolves({ data: { 'display-ribbon-on-profiles': 'dev', activeProfiles : ['dev', 'test']}}); <%_ if (authenticationType === 'session' || authenticationType === 'oauth2') { _%>const cookie = {get: jest.fn()};<%_ } %> accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationType === 'session' || authenticationType === 'oauth2') { _%>cookie,<%_ } %><%_ if (websocket === 'spring-websocket') { _%>null,<%_ } %> router); expect(store.getters.logon).toBe(false); expect(accountService.authenticated).toBe(false); expect(store.getters.account).toBe(null); - expect(mockedAxios.get).toHaveBeenCalledWith('management/info'); + expect(axiosStub.get.calledWith('management/info')).toBeTruthy(); expect(store.getters.activeProfiles[0]).toBe('dev'); expect(store.getters.activeProfiles[1]).toBe('test'); expect(store.getters.ribbonOnProfiles).toBe('dev'); @@ -53,27 +54,28 @@ describe('Account Service test suite', () => { <%_ if (authenticationType == 'jwt') { _%> localStorage.setItem('<%=jhiPrefixDashed %>-authenticationToken', 'token'); <%_ } %> - mockedAxios.get.mockReturnValue(Promise.resolve({})); + axiosStub.get.resolves({}); accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationType === 'session' || authenticationType === 'oauth2') { _%>mockedCookie,<%_ } %><%_ if (websocket === 'spring-websocket') { _%>null,<%_ } %> router); expect((router).history.current.fullPath).toBe('/'); expect(store.getters.logon).toBe(false); expect(accountService.authenticated).toBe(false); expect(store.getters.account).toBe(null); - expect(mockedAxios.get).toHaveBeenCalledWith('management/info'); + expect(axiosStub.get.calledWith('management/info')).toBeTruthy(); }); it('should init service and retrieve profiles if already logged in before but exception occurred and should be logged out', async () => { <%_ if (authenticationType == 'jwt') { _%> localStorage.setItem('<%=jhiPrefixDashed %>-authenticationToken', 'token'); <%_ } %> - mockedAxios.get = jest.fn(apiName => apiName === 'api/account' ? Promise.reject() : Promise.resolve({})); + axiosStub.get.resolves({}); + axiosStub.get.withArgs('api/account').rejects(); accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationType === 'session' || authenticationType === 'oauth2') { _%>mockedCookie,<%_ } %><%_ if (websocket === 'spring-websocket') { _%>null,<%_ } %> router); expect((router).history.current.fullPath).toBe('/'); expect(accountService.authenticated).toBe(false); expect(store.getters.account).toBe(null); - expect(mockedAxios.get).toHaveBeenCalledWith('management/info'); + expect(axiosStub.get.calledWith('management/info')).toBeTruthy(); }); it('should init service and check for authority after retrieving account but getAccount failed', async () => { @@ -84,7 +86,7 @@ describe('Account Service test suite', () => { <%_ if (authenticationType == 'jwt') { _%> localStorage.setItem('<%=jhiPrefixDashed %>-authenticationToken', 'token'); <%_ } %> - mockedAxios.get = jest.fn(apiName => Promise.reject()); + axiosStub.get.rejects(); accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationType === 'session' || authenticationType === 'oauth2') { _%>mockedCookie,<%_ } %><%_ if (websocket === 'spring-websocket') { _%>trackerService,<%_ } %> router); return accountService.hasAnyAuthorityAndCheckAuth('USER').then((value: boolean) => { @@ -100,7 +102,7 @@ describe('Account Service test suite', () => { <%_ if (authenticationType == 'jwt') { _%> localStorage.setItem('<%=jhiPrefixDashed %>-authenticationToken', 'token'); <%_ } %> - mockedAxios.get.mockReturnValue(Promise.resolve({ data: { authorities: ['USER'] } })); + axiosStub.get.resolves({ data: { authorities: ['USER'] } }); accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationType === 'session' || authenticationType === 'oauth2') { _%>mockedCookie,<%_ } %><%_ if (websocket === 'spring-websocket') { _%>trackerService,<%_ } %> router); return accountService.hasAnyAuthorityAndCheckAuth('USER').then((value: boolean) => { @@ -109,7 +111,8 @@ describe('Account Service test suite', () => { }); it('should init service as not authentified and not return any authorities admin and not retrieve account', async () => { - mockedAxios.get = jest.fn(apiName => (apiName === 'api/account' ? Promise.reject() : Promise.resolve({}))); + axiosStub.get.resolves({}); + axiosStub.get.withArgs('api/account').rejects(); accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationType === 'session' || authenticationType === 'oauth2') { _%>mockedCookie,<%_ } %><%_ if (websocket === 'spring-websocket') { _%>null,<%_ } %> router); return accountService.hasAnyAuthorityAndCheckAuth('ADMIN').then((value: boolean) => { @@ -118,7 +121,8 @@ describe('Account Service test suite', () => { }); it('should init service as not authentified and return authority user', async () => { - mockedAxios.get = jest.fn(apiName => (apiName === 'api/account' ? Promise.reject() : Promise.resolve({}))); + axiosStub.get.resolves({}); + axiosStub.get.withArgs('api/account').rejects(); accountService = await new AccountService(store, <%_ if (enableTranslation) { _%>new TranslationService(store, i18n),<%_ } %><%_ if (authenticationType === 'session' || authenticationType === 'oauth2') { _%>mockedCookie,<%_ } %><%_ if (websocket === 'spring-websocket') { _%>null,<%_ } %> router); return accountService.hasAnyAuthorityAndCheckAuth('USER').then((value: boolean) => { diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/account/activate/activate.component.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/account/activate/activate.component.spec.ts.ejs index 048f464df6c7..24fb51641ceb 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/account/activate/activate.component.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/account/activate/activate.component.spec.ts.ejs @@ -1,5 +1,6 @@ import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils'; import axios from 'axios'; +import sinon from 'sinon'; import * as config from '@/shared/config/config'; import Activate from '@/account/activate/activate.vue'; @@ -8,7 +9,6 @@ import ActivateService from '@/account/activate/activate.service'; import LoginService from '@/account/login.service'; const localVue = createLocalVue(); -const mockedAxios: any = axios; config.initVueApp(localVue); <%_ if (enableTranslation) { _%> @@ -16,10 +16,10 @@ const i18n = config.initI18N(localVue); <%_ } _%> const store = config.initVueXStore(localVue); -jest.mock('axios', () => ({ - get: jest.fn(), - post: jest.fn() -})); +const axiosStub = { + get: sinon.stub(axios, 'get'), + post: sinon.stub(axios, 'post'), +}; describe('Activate Component', () => { @@ -27,8 +27,7 @@ describe('Activate Component', () => { let activate: ActivateClass; beforeEach(() => { - mockedAxios.get.mockReset(); - mockedAxios.get.mockReturnValue(Promise.resolve({})); + axiosStub.get.resolves({}); wrapper = shallowMount(Activate, { <%_ if (enableTranslation) { _%> @@ -44,7 +43,7 @@ describe('Activate Component', () => { }); it('should display error when activation fails using route', async () => { - mockedAxios.get.mockReturnValue(Promise.reject({})); + axiosStub.get.rejects({}); activate.beforeRouteEnter({query: {key: 'invalid-key'}}, null, cb => cb(activate)); await activate.$nextTick(); @@ -54,7 +53,7 @@ describe('Activate Component', () => { it('should display error when activation fails', async () => { - mockedAxios.get.mockReturnValue(Promise.reject({})); + axiosStub.get.rejects({}); activate.init('invalid-key'); await activate.$nextTick(); @@ -64,7 +63,7 @@ describe('Activate Component', () => { it('should display success when activation succeeds', async () => { - mockedAxios.get.mockReturnValue(Promise.resolve({})); + axiosStub.get.resolves({}); activate.init('valid-key'); await activate.$nextTick(); diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/account/change-password/change-password.component.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/account/change-password/change-password.component.spec.ts.ejs index 997218e1cc12..4152ad3a210b 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/account/change-password/change-password.component.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/account/change-password/change-password.component.spec.ts.ejs @@ -1,12 +1,12 @@ import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils'; import axios from 'axios'; +import sinon from 'sinon'; import * as config from '@/shared/config/config'; import ChangePassword from '@/account/change-password/change-password.vue'; import ChangePasswordClass from '@/account/change-password/change-password.component'; const localVue = createLocalVue(); -const mockedAxios: any = axios; config.initVueApp(localVue); <%_ if (enableTranslation) { _%> @@ -14,19 +14,18 @@ const i18n = config.initI18N(localVue); <%_ } _%> const store = config.initVueXStore(localVue); -jest.mock('axios', () => ({ - get: jest.fn(), - post: jest.fn() -})); +const axiosStub = { + get: sinon.stub(axios, 'get'), + post: sinon.stub(axios, 'post'), +}; describe('ChangePassword Component', () => { let wrapper: Wrapper; let changePassword: ChangePasswordClass; beforeEach(() => { - mockedAxios.get.mockReset(); - mockedAxios.get.mockReturnValue(Promise.resolve({})); - mockedAxios.post.mockReset(); + axiosStub.get.resolves({}); + axiosStub.post.reset(); wrapper = shallowMount(ChangePassword, { @@ -38,7 +37,7 @@ describe('ChangePassword Component', () => { }); changePassword = wrapper.vm; }); - + it('should show error if passwords do not match', () => { // GIVEN changePassword.resetPassword = { newPassword: 'password1', confirmPassword: 'password2' }; @@ -53,17 +52,17 @@ describe('ChangePassword Component', () => { it('should call Auth.changePassword when passwords match and set success to OK upon success', async () => { // GIVEN changePassword.resetPassword = { currentPassword: 'password1', newPassword: 'password1', confirmPassword: 'password1' }; - mockedAxios.post.mockReturnValue(Promise.resolve({})); + axiosStub.post.resolves({}); // WHEN changePassword.changePassword(); await changePassword.$nextTick(); // THEN - expect(mockedAxios.post).toHaveBeenCalledWith('api/account/change-password', { + expect(axiosStub.post.calledWith('api/account/change-password', { currentPassword: 'password1', newPassword: 'password1' - }); + })).toBeTruthy(); expect(changePassword.doNotMatch).toBeNull(); expect(changePassword.error).toBeNull(); @@ -73,7 +72,7 @@ describe('ChangePassword Component', () => { it('should notify of error if change password fails', async () => { // GIVEN changePassword.resetPassword = { currentPassword: 'password1', newPassword: 'password1', confirmPassword: 'password1' }; - mockedAxios.post.mockReturnValue(Promise.reject({})); + axiosStub.post.rejects({}); // WHEN changePassword.changePassword(); diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/account/login-form/login-form.component.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/account/login-form/login-form.component.spec.ts.ejs index 3c5a760c4a43..46eb3488b074 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/account/login-form/login-form.component.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/account/login-form/login-form.component.spec.ts.ejs @@ -1,5 +1,6 @@ import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils'; import axios from 'axios'; +import sinon from 'sinon'; import AccountService from '@/account/account.service'; import router from '@/router'; <%_ if (enableTranslation) { _%> @@ -21,7 +22,6 @@ localVue.component('b-form-input', {}); localVue.component('b-form-group', {}); localVue.component('b-form-checkbox', {}); localVue.component('b-link', {}); -const mockedAxios: any = axios; config.initVueApp(localVue); <%_ if (enableTranslation) { _%> @@ -29,19 +29,18 @@ const i18n = config.initI18N(localVue); <%_ } _%> const store = config.initVueXStore(localVue); -jest.mock('axios', () => ({ - get: jest.fn(), - post: jest.fn() -})); +const axiosStub = { + get: sinon.stub(axios, 'get'), + post: sinon.stub(axios, 'post'), +}; describe('LoginForm Component', () => { let wrapper: Wrapper; let loginForm: LoginFormClass; beforeEach(() => { - mockedAxios.get.mockReset(); - mockedAxios.get.mockReturnValue(Promise.resolve({})); - mockedAxios.post.mockReset(); + axiosStub.get.resolves({}); + axiosStub.post.reset(); wrapper = shallowMount(LoginForm, { @@ -63,18 +62,18 @@ describe('LoginForm Component', () => { loginForm.login = 'login'; loginForm.password = 'pwd'; loginForm.rememberMe = true; - mockedAxios.post.mockReturnValue(Promise.reject()); + axiosStub.post.rejects(); // WHEN loginForm.doLogin(); await loginForm.$nextTick(); // THEN - expect(mockedAxios.post).toHaveBeenCalledWith('api/authenticate', { + expect(axiosStub.post.calledWith('api/authenticate', { username: 'login', password: 'pwd', rememberMe: true - }); + })).toBeTruthy(); await loginForm.$nextTick(); expect(loginForm.authenticationError).toBeTruthy(); }); @@ -85,18 +84,18 @@ describe('LoginForm Component', () => { loginForm.password = 'pwd'; loginForm.rememberMe = true; const jwtSecret = 'jwt-secret'; - mockedAxios.post.mockReturnValue(Promise.resolve({ headers: { authorization: 'Bearer ' + jwtSecret } })); + axiosStub.post.resolves({ headers: { authorization: 'Bearer ' + jwtSecret } }); // WHEN loginForm.doLogin(); await loginForm.$nextTick(); // THEN - expect(mockedAxios.post).toHaveBeenCalledWith('api/authenticate', { + expect(axiosStub.post.calledWith('api/authenticate', { username: 'login', password: 'pwd', rememberMe: true - }); + })).toBeTruthy(); expect(loginForm.authenticationError).toBeFalsy(); expect(localStorage.getItem('<%=jhiPrefixDashed %>-authenticationToken')).toEqual(jwtSecret); @@ -108,18 +107,18 @@ describe('LoginForm Component', () => { loginForm.password = 'pwd'; loginForm.rememberMe = false; const jwtSecret = 'jwt-secret'; - mockedAxios.post.mockReturnValue(Promise.resolve({ headers: { authorization: 'Bearer ' + jwtSecret } })); + axiosStub.post.resolves({ headers: { authorization: 'Bearer ' + jwtSecret } }); // WHEN loginForm.doLogin(); await loginForm.$nextTick(); // THEN - expect(mockedAxios.post).toHaveBeenCalledWith('api/authenticate', { + expect(axiosStub.post.calledWith('api/authenticate', { username: 'login', password: 'pwd', rememberMe: false - }); + })).toBeTruthy(); expect(loginForm.authenticationError).toBeFalsy(); expect(sessionStorage.getItem('<%=jhiPrefixDashed %>-authenticationToken')).toEqual(jwtSecret); @@ -130,16 +129,16 @@ describe('LoginForm Component', () => { loginForm.login = 'login'; loginForm.password = 'pwd'; loginForm.rememberMe = true; - mockedAxios.post.mockReturnValue(Promise.reject()); + axiosStub.post.rejects(); // WHEN loginForm.doLogin(); await loginForm.$nextTick(); // THEN - expect(mockedAxios.post).toHaveBeenCalledWith('api/authentication', + expect(axiosStub.post.calledWith('api/authentication', 'username=login&password=pwd&remember-me=true&submit=Login', - { "headers": { "Content-Type": "application/x-www-form-urlencoded" } }); + { "headers": { "Content-Type": "application/x-www-form-urlencoded" } })).toBeTruthy(); await loginForm.$nextTick(); expect(loginForm.authenticationError).toBeTruthy(); }); @@ -149,16 +148,16 @@ describe('LoginForm Component', () => { loginForm.login = 'login'; loginForm.password = 'pwd'; loginForm.rememberMe = true; - mockedAxios.post.mockReturnValue(Promise.resolve({})); + axiosStub.post.resolves({}); // WHEN loginForm.doLogin(); await loginForm.$nextTick(); // THEN - expect(mockedAxios.post).toHaveBeenCalledWith('api/authentication', + expect(axiosStub.post.calledWith('api/authentication', 'username=login&password=pwd&remember-me=true&submit=Login', - { "headers": { "Content-Type": "application/x-www-form-urlencoded" } }); + { "headers": { "Content-Type": "application/x-www-form-urlencoded" } })).toBeTruthy(); expect(loginForm.authenticationError).toBeFalsy(); }); diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/account/login.service.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/account/login.service.spec.ts.ejs index 43d142c97e7e..8d978a7ab4ad 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/account/login.service.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/account/login.service.spec.ts.ejs @@ -1,11 +1,12 @@ import LoginService from '@/account/login.service'; <%_ if (authenticationType !== 'jwt') { _%> import axios from 'axios'; +import sinon from 'sinon'; -const mockedAxios: any = axios; -jest.mock('axios', () => ({ - post: jest.fn() -})); +const axiosStub = { + get: sinon.stub(axios, 'get'), + post: sinon.stub(axios, 'post'), +}; <%_ } _%> describe('Login Service test suite', () => { @@ -26,17 +27,17 @@ describe('Login Service test suite', () => { it('should build url for login with loc.pathname equals to /accessdenied', () => { const loc = { href: '', hostname: 'localhost', pathname: '/accessdenied' }; - + loginService.login(loc); - + expect(loc.href).toBe('//localhost/oauth2/authorization/oidc'); }); - + it('should build url for login with loc.pathname equals to /forbidden', () => { const loc = { href: '', hostname: 'localhost', pathname: '/forbidden' }; - + loginService.login(loc); - + expect(loc.href).toBe('//localhost/oauth2/authorization/oidc'); }); @@ -53,7 +54,7 @@ describe('Login Service test suite', () => { it('should call global logout when asked to', () => { loginService.logout(); - expect(mockedAxios.post).toHaveBeenCalledWith('api/logout'); + expect(axiosStub.post.calledWith('api/logout')).toBeTruthy(); }); <%_ } _%> }); diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/account/register/register.component.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/account/register/register.component.spec.ts.ejs index 30e7a940d00d..e0cbe28246f2 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/account/register/register.component.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/account/register/register.component.spec.ts.ejs @@ -1,5 +1,6 @@ import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils'; import axios from 'axios'; +import sinon from 'sinon'; import { EMAIL_ALREADY_USED_TYPE, LOGIN_ALREADY_USED_TYPE } from '@/constants'; import * as config from '@/shared/config/config'; @@ -9,7 +10,6 @@ import RegisterService from '@/account/register/register.service'; import LoginService from '@/account/login.service'; const localVue = createLocalVue(); -const mockedAxios: any = axios; config.initVueApp(localVue); <%_ if (enableTranslation) { _%> @@ -17,10 +17,10 @@ const i18n = config.initI18N(localVue); <%_ } _%> const store = config.initVueXStore(localVue); -jest.mock('axios', () => ({ - get: jest.fn(), - post: jest.fn() -})); +const axiosStub = { + get: sinon.stub(axios, 'get'), + post: sinon.stub(axios, 'post'), +}; describe('Register Component', () => { let wrapper: Wrapper; @@ -28,9 +28,8 @@ describe('Register Component', () => { const filledRegisterAccount = {'email': 'jhi@pster.net', 'langKey': '<%= nativeLanguage %>', 'login': 'jhi', 'password': 'jhipster'}; beforeEach(() => { - mockedAxios.get.mockReset(); - mockedAxios.get.mockReturnValue(Promise.resolve({})); - mockedAxios.post.mockReset(); + axiosStub.get.resolves({}); + axiosStub.post.reset(); wrapper = shallowMount(Register, { store, @@ -67,13 +66,13 @@ describe('Register Component', () => { }); it('should register when password match', async () => { - mockedAxios.post.mockReturnValue(Promise.resolve()); + axiosStub.post.resolves(); register.registerAccount = filledRegisterAccount; register.confirmPassword = filledRegisterAccount.password; register.register(); await register.$nextTick(); - expect(mockedAxios.post).toHaveBeenCalledWith('api/register', {'email': 'jhi@pster.net', 'langKey': '<%= nativeLanguage %>', 'login': 'jhi', 'password': 'jhipster'}); + expect(axiosStub.post.calledWith('api/register', {'email': 'jhi@pster.net', 'langKey': '<%= nativeLanguage %>', 'login': 'jhi', 'password': 'jhipster'})).toBeTruthy(); expect(register.success).toBe(true); expect(register.error).toBe(null); expect(register.errorEmailExists).toBe(null); @@ -82,13 +81,13 @@ describe('Register Component', () => { it('should register when password match but throw error when login already exist', async () => { const error = { response: { status: 400, data: { type: LOGIN_ALREADY_USED_TYPE} } }; - mockedAxios.post.mockReturnValue(Promise.reject(error)); + axiosStub.post.rejects(error); register.registerAccount = filledRegisterAccount; register.confirmPassword = filledRegisterAccount.password; register.register(); await register.$nextTick(); - expect(mockedAxios.post).toHaveBeenCalledWith('api/register', {'email': 'jhi@pster.net', 'langKey': '<%= nativeLanguage %>', 'login': 'jhi', 'password': 'jhipster'}); + expect(axiosStub.post.calledWith('api/register', {'email': 'jhi@pster.net', 'langKey': '<%= nativeLanguage %>', 'login': 'jhi', 'password': 'jhipster'})).toBeTruthy(); await register.$nextTick(); expect(register.success).toBe(null); expect(register.error).toBe(null); @@ -98,13 +97,13 @@ describe('Register Component', () => { it('should register when password match but throw error when email already used', async () => { const error = { response: { status: 400, data: { type: EMAIL_ALREADY_USED_TYPE} } }; - mockedAxios.post.mockReturnValue(Promise.reject(error)); + axiosStub.post.rejects(error); register.registerAccount = filledRegisterAccount; register.confirmPassword = filledRegisterAccount.password; register.register(); await register.$nextTick(); - expect(mockedAxios.post).toHaveBeenCalledWith('api/register', {'email': 'jhi@pster.net', 'langKey': '<%= nativeLanguage %>', 'login': 'jhi', 'password': 'jhipster'}); + expect(axiosStub.post.calledWith('api/register', {'email': 'jhi@pster.net', 'langKey': '<%= nativeLanguage %>', 'login': 'jhi', 'password': 'jhipster'})).toBeTruthy(); await register.$nextTick(); expect(register.success).toBe(null); expect(register.error).toBe(null); @@ -114,13 +113,13 @@ describe('Register Component', () => { it('should register when password match but throw error', async () => { const error = { response: { status: 400, data: { type: 'unknown'} } }; - mockedAxios.post.mockReturnValue(Promise.reject(error)); + axiosStub.post.rejects(error); register.registerAccount = filledRegisterAccount; register.confirmPassword = filledRegisterAccount.password; register.register(); await register.$nextTick(); - expect(mockedAxios.post).toHaveBeenCalledWith('api/register', {'email': 'jhi@pster.net', 'langKey': '<%= nativeLanguage %>', 'login': 'jhi', 'password': 'jhipster'}); + expect(axiosStub.post.calledWith('api/register', {'email': 'jhi@pster.net', 'langKey': '<%= nativeLanguage %>', 'login': 'jhi', 'password': 'jhipster'})).toBeTruthy(); await register.$nextTick(); expect(register.success).toBe(null); expect(register.errorEmailExists).toBe(null); diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/account/reset-password/finish/reset-password-finish.component.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/account/reset-password/finish/reset-password-finish.component.spec.ts.ejs index 0c6182017894..52607271e863 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/account/reset-password/finish/reset-password-finish.component.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/account/reset-password/finish/reset-password-finish.component.spec.ts.ejs @@ -1,4 +1,5 @@ import axios from 'axios'; +import sinon from 'sinon'; import * as config from '@/shared/config/config'; import { createLocalVue, shallowMount, Wrapper } from '@vue/test-utils'; import ResetPasswordFinish from '@/account/reset-password/finish/reset-password-finish.vue'; @@ -6,24 +7,23 @@ import ResetPasswordFinishClass from '@/account/reset-password/finish/reset-pass import LoginService from '@/account/login.service'; const localVue = createLocalVue(); -const mockedAxios: any = axios; config.initVueApp(localVue); <%_ if (enableTranslation) { _%> const i18n = config.initI18N(localVue); <%_ } _%> -jest.mock('axios', () => ({ - get: jest.fn(), - post: jest.fn() -})); +const axiosStub = { + get: sinon.stub(axios, 'get'), + post: sinon.stub(axios, 'post'), +}; describe('Reset Component Finish', () => { let wrapper: Wrapper; let resetPasswordFinish: ResetPasswordFinishClass; beforeEach(() => { - mockedAxios.post.mockReset(); + axiosStub.post.reset(); wrapper = shallowMount(ResetPasswordFinish, { <%_ if (enableTranslation) { _%> i18n, @@ -38,7 +38,7 @@ describe('Reset Component Finish', () => { it('should reset finish be a success', async () => { // Given - mockedAxios.post.mockReturnValue(Promise.resolve()); + axiosStub.post.resolves(); // When await resetPasswordFinish.finishReset(); @@ -49,16 +49,14 @@ describe('Reset Component Finish', () => { it('should reset request fail as an error', async () => { // Given - mockedAxios.post.mockReturnValue( - Promise.reject({ - response: { - status: null, - data: { - type: null - } + axiosStub.post.rejects({ + response: { + status: null, + data: { + type: null } - }) - ); + } + }); // When resetPasswordFinish.finishReset(); diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/account/reset-password/init/reset-password-init.component.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/account/reset-password/init/reset-password-init.component.spec.ts.ejs index 0add76e48241..f4df5cb19209 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/account/reset-password/init/reset-password-init.component.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/account/reset-password/init/reset-password-init.component.spec.ts.ejs @@ -1,28 +1,28 @@ import { createLocalVue, shallowMount, Wrapper } from '@vue/test-utils'; import axios from 'axios'; +import sinon from 'sinon'; import * as config from '@/shared/config/config'; import ResetPasswordInit from '@/account/reset-password/init/reset-password-init.vue'; import ResetPasswordInitClass from '@/account/reset-password/init/reset-password-init.component'; const localVue = createLocalVue(); -const mockedAxios: any = axios; config.initVueApp(localVue); <%_ if (enableTranslation) { _%> const i18n = config.initI18N(localVue); <%_ } _%> -jest.mock('axios', () => ({ - get: jest.fn(), - post: jest.fn() -})); +const axiosStub = { + get: sinon.stub(axios, 'get'), + post: sinon.stub(axios, 'post'), +}; describe('Reset Component Init', () => { let wrapper: Wrapper; let resetPasswordInit: ResetPasswordInitClass; beforeEach(() => { - mockedAxios.post.mockReset(); + axiosStub.post.reset(); wrapper = shallowMount(ResetPasswordInit, { <%_ if (enableTranslation) { _%> i18n, @@ -34,7 +34,7 @@ describe('Reset Component Init', () => { it('should reset request be a success', async () => { // Given - mockedAxios.post.mockReturnValue(Promise.resolve()); + axiosStub.post.resolves(); // When await resetPasswordInit.requestReset(); @@ -45,14 +45,14 @@ describe('Reset Component Init', () => { it('should reset request fail as an error', async () => { // Given - mockedAxios.post.mockReturnValue(Promise.reject({ + axiosStub.post.rejects({ response: { status: null, data: { type: null } } - })); + }); // When resetPasswordInit.requestReset(); diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/account/sessions/sessions.component.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/account/sessions/sessions.component.spec.ts.ejs index e4bbe67d07a3..bc98dfd8ee12 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/account/sessions/sessions.component.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/account/sessions/sessions.component.spec.ts.ejs @@ -1,5 +1,6 @@ import { createLocalVue, shallowMount, Wrapper } from '@vue/test-utils'; import axios from 'axios'; +import sinon from 'sinon'; import * as config from '@/shared/config/config'; import SessionsClass from '@/account/sessions/sessions.component'; import Sessions from '@/account/sessions/sessions.vue'; @@ -12,7 +13,6 @@ import TrackerService from '@/admin/tracker/tracker.service'; <%_ } _%> const localVue = createLocalVue(); -const mockedAxios: any = axios; config.initVueApp(localVue); <%_ if (enableTranslation) { _%> @@ -20,16 +20,9 @@ const i18n = config.initI18N(localVue); <%_ } _%> const store = config.initVueXStore(localVue); -jest.mock('axios', () => ({ - get: jest.fn(), - delete: jest.fn() -})); - -const mockedAxiosResetGet = (): void => { - mockedAxios.get.mockReset(); - mockedAxios.get.mockReturnValue(Promise.resolve({ - data: [], - })); +const axiosStub = { + get: sinon.stub(axios, 'get'), + delete: sinon.stub(axios, 'delete'), }; describe('Sessions Component', () => { @@ -37,8 +30,9 @@ describe('Sessions Component', () => { let sessions: SessionsClass; beforeEach(() => { - mockedAxiosResetGet(); - mockedAxios.delete.mockReset(); + axiosStub.get.reset(); + axiosStub.get.resolves({ data: [] }); + axiosStub.delete.reset(); store.commit('authenticated', { login: 'username' @@ -55,7 +49,7 @@ describe('Sessions Component', () => { }); it('should call remote service on init', () => { - expect(mockedAxios.get).toHaveBeenCalledTimes(1); + expect(axiosStub.get.callCount).toEqual(1); }); it('should have good username', () => { @@ -64,8 +58,9 @@ describe('Sessions Component', () => { it('should invalidate a session', async () => { // Given - mockedAxiosResetGet(); - mockedAxios.delete.mockReturnValue(Promise.resolve()); + axiosStub.get.reset(); + axiosStub.get.resolves({ data: [] }); + axiosStub.delete.resolves(); // When sessions.invalidate('session'); @@ -74,13 +69,14 @@ describe('Sessions Component', () => { // Then expect(sessions.error).toBeNull(); expect(sessions.success).toEqual('OK'); - expect(mockedAxios.get).toHaveBeenCalledTimes(1); + expect(axiosStub.get.callCount).toEqual(1); }); it('should fail to invalidate session', async () => { // Given - mockedAxiosResetGet(); - mockedAxios.delete.mockReturnValue(Promise.reject()); + axiosStub.get.reset(); + axiosStub.get.resolves({ data: [] }); + axiosStub.delete.rejects(); // When sessions.invalidate('session'); @@ -89,6 +85,6 @@ describe('Sessions Component', () => { // Then expect(sessions.success).toBeNull(); expect(sessions.error).toEqual('ERROR'); - expect(mockedAxios.get).toHaveBeenCalledTimes(0); + expect(axiosStub.get.callCount).toEqual(0); }); }); diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/account/settings/settings.component.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/account/settings/settings.component.spec.ts.ejs index 94d2dd4e0f0c..07892ad205d5 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/account/settings/settings.component.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/account/settings/settings.component.spec.ts.ejs @@ -1,5 +1,6 @@ import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils'; import axios from 'axios'; +import sinon from 'sinon'; import * as config from '@/shared/config/config'; import Settings from '@/account/settings/settings.vue'; @@ -7,7 +8,6 @@ import SettingsClass from '@/account/settings/settings.component'; import { EMAIL_ALREADY_USED_TYPE } from '@/constants'; const localVue = createLocalVue(); -const mockedAxios: any = axios; config.initVueApp(localVue); <%_ if (enableTranslation) { _%> @@ -15,10 +15,10 @@ const i18n = config.initI18N(localVue); <%_ } _%> const store = config.initVueXStore(localVue); -jest.mock('axios', () => ({ - get: jest.fn(), - post: jest.fn() -})); +const axiosStub = { + get: sinon.stub(axios, 'get'), + post: sinon.stub(axios, 'post'), +}; describe('Settings Component', () => { let wrapper: Wrapper; @@ -30,9 +30,8 @@ describe('Settings Component', () => { }; beforeEach(() => { - mockedAxios.get.mockReset(); - mockedAxios.get.mockReturnValue(Promise.resolve({})); - mockedAxios.post.mockReset(); + axiosStub.get.resolves({}); + axiosStub.post.reset(); store.commit('authenticated', account); wrapper = shallowMount(Settings, @@ -48,19 +47,19 @@ describe('Settings Component', () => { it('should send the current identity upon save', async () => { // GIVEN - mockedAxios.post.mockReturnValue(Promise.resolve({})); + axiosStub.post.resolves({}); // WHEN settings.save(); await settings.$nextTick(); // THEN - expect(mockedAxios.post).toHaveBeenCalledWith('api/account', account); + expect(axiosStub.post.calledWith('api/account', account)).toBeTruthy(); }); it('should notify of success upon successful save', async () => { // GIVEN - mockedAxios.post.mockReturnValue(Promise.resolve(account)); + axiosStub.post.resolves(account); // WHEN settings.save(); @@ -74,7 +73,7 @@ describe('Settings Component', () => { it('should notify of error upon failed save', async () => { // GIVEN const error = { response: { status: 417 } }; - mockedAxios.post.mockReturnValue(Promise.reject(error)); + axiosStub.post.rejects(error); // WHEN settings.save(); @@ -89,7 +88,7 @@ describe('Settings Component', () => { it('should notify of error upon error 400', async () => { // GIVEN const error = { response: { status: 400, data: {} } }; - mockedAxios.post.mockReturnValue(Promise.reject(error)); + axiosStub.post.rejects(error); // WHEN settings.save(); @@ -104,7 +103,7 @@ describe('Settings Component', () => { it('should notify of error upon email already used', async () => { // GIVEN const error = { response: { status: 400, data: { type: EMAIL_ALREADY_USED_TYPE } } }; - mockedAxios.post.mockReturnValue(Promise.reject(error)); + axiosStub.post.rejects(error); // WHEN settings.save(); diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/admin/configuration/configuration.component.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/admin/configuration/configuration.component.spec.ts.ejs index 228fba54dab8..6fc678c9e299 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/admin/configuration/configuration.component.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/admin/configuration/configuration.component.spec.ts.ejs @@ -1,5 +1,6 @@ import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils'; import axios from 'axios'; +import sinon from 'sinon'; import * as config from '@/shared/config/config'; import Configuration from '@/admin/configuration/configuration.vue'; @@ -7,7 +8,6 @@ import ConfigurationClass from '@/admin/configuration/configuration.component'; import ConfigurationService from '@/admin/configuration/configuration.service'; const localVue = createLocalVue(); -const mockedAxios: any = axios; config.initVueApp(localVue); <%_ if (enableTranslation) { _%> @@ -15,19 +15,19 @@ const i18n = config.initI18N(localVue); <%_ } _%> const store = config.initVueXStore(localVue); -jest.mock('axios', () => ({ - get: jest.fn() -})); +const axiosStub = { + get: sinon.stub(axios, 'get'), +}; describe('Configuration Component', () => { let wrapper: Wrapper; let configuration: ConfigurationClass; beforeEach(() => { - mockedAxios.get.mockReset(); - mockedAxios.get.mockReturnValue(Promise.resolve({ data: { contexts: [ + axiosStub.get.reset(); + axiosStub.get.resolves({ data: { contexts: [ { beans: [{prefix: 'A'}, {prefix: 'B'}] } - ], propertySources: [{ properties: { key1: {value: 'value'} }}] } })); + ], propertySources: [{ properties: { key1: {value: 'value'} }}] } }); wrapper = shallowMount(Configuration, { store, <% if (enableTranslation) { %>i18n, <% } %>localVue, provide: {configurationService: () => new ConfigurationService() } }); configuration = wrapper.vm; }); @@ -45,8 +45,8 @@ describe('Configuration Component', () => { await configuration.$nextTick(); // THEN - expect(mockedAxios.get).toHaveBeenCalledWith('management/env'); - expect(mockedAxios.get).toHaveBeenCalledWith('management/configprops'); + expect(axiosStub.get.calledWith('management/env')).toBeTruthy(); + expect(axiosStub.get.calledWith('management/configprops')).toBeTruthy(); }); }); diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/admin/health/health.component.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/admin/health/health.component.spec.ts.ejs index cf454fcd7c3f..d9004a003c36 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/admin/health/health.component.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/admin/health/health.component.spec.ts.ejs @@ -1,5 +1,6 @@ import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils'; import axios from 'axios'; +import sinon from 'sinon'; import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'; import * as config from '@/shared/config/config'; @@ -9,7 +10,6 @@ import HealthClass from '@/admin/health/health.component'; import HealthService from '@/admin/health/health.service'; const localVue = createLocalVue(); -const mockedAxios: any = axios; config.initVueApp(localVue); <%_ if (enableTranslation) { _%> @@ -20,16 +20,16 @@ localVue.component('font-awesome-icon', FontAwesomeIcon); localVue.component('health-modal', HealthModal); localVue.directive('b-modal', {}); -jest.mock('axios', () => ({ - get: jest.fn() -})); +const axiosStub = { + get: sinon.stub(axios, 'get'), +}; describe('Health Component', () => { let wrapper: Wrapper; let health: HealthClass; beforeEach(() => { - mockedAxios.get.mockReturnValue(Promise.resolve({})); + axiosStub.get.resolves({}); wrapper = shallowMount(Health, { store, <% if (enableTranslation) { %>i18n, <% } %> @@ -74,27 +74,27 @@ describe('Health Component', () => { describe('refresh', () => { it('should call refresh on init', async () => { // GIVEN - mockedAxios.get.mockReturnValue(Promise.resolve({})); + axiosStub.get.resolves({}); // WHEN health.refresh(); await health.$nextTick(); // THEN - expect(mockedAxios.get).toHaveBeenCalledWith('management/health'); + expect(axiosStub.get.calledWith('management/health')).toBeTruthy(); await health.$nextTick(); expect(health.updatingHealth).toEqual(false); }); it('should handle a 503 on refreshing health data', async () => { // GIVEN - mockedAxios.get.mockReturnValue(Promise.reject({})); + axiosStub.get.rejects({}); // WHEN health.refresh(); await health.$nextTick(); // THEN - expect(mockedAxios.get).toHaveBeenCalledWith('management/health'); + expect(axiosStub.get.calledWith('management/health')).toBeTruthy(); await health.$nextTick(); expect(health.updatingHealth).toEqual(false); }); diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/admin/logs/logs.component.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/admin/logs/logs.component.spec.ts.ejs index 5163a9c2935f..a8cd70557417 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/admin/logs/logs.component.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/admin/logs/logs.component.spec.ts.ejs @@ -1,5 +1,6 @@ import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils'; import axios from 'axios'; +import sinon from 'sinon'; import Logs from '@/admin/logs/logs.vue'; import LogsClass from '@/admin/logs/logs.component'; import LogsService from '@/admin/logs/logs.service'; @@ -7,7 +8,6 @@ import LogsService from '@/admin/logs/logs.service'; import * as config from '@/shared/config/config'; const localVue = createLocalVue(); -const mockedAxios: any = axios; config.initVueApp(localVue); <%_ if (enableTranslation) { _%> @@ -15,17 +15,17 @@ const i18n = config.initI18N(localVue); <%_ } _%> const store = config.initVueXStore(localVue); -jest.mock('axios', () => ({ - get: jest.fn(), - post: jest.fn() -})); +const axiosStub = { + get: sinon.stub(axios, 'get'), + post: sinon.stub(axios, 'post'), +}; describe('Logs Component', () => { let wrapper: Wrapper; let logs: LogsClass; beforeEach(() => { - mockedAxios.get.mockReturnValue(Promise.resolve({})); + axiosStub.get.resolves({}); wrapper = shallowMount(Logs, { store, <% if (enableTranslation) { %>i18n, <% } %>localVue, provide: {logsService: () => new LogsService() } }); logs = wrapper.vm; }); @@ -43,21 +43,21 @@ describe('Logs Component', () => { await logs.$nextTick(); // THEN - expect(mockedAxios.get).toHaveBeenCalledWith('management/loggers'); + expect(axiosStub.get.calledWith('management/loggers')).toBeTruthy(); }); }); describe('change log level', () => { it('should change log level correctly', async () => { - mockedAxios.post.mockReturnValue(Promise.resolve({})); + axiosStub.post.resolves({}); // WHEN logs.updateLevel('main', 'ERROR'); await logs.$nextTick(); // THEN - expect(mockedAxios.post).toHaveBeenCalledWith('management/loggers/main', {configuredLevel: 'ERROR'}); - expect(mockedAxios.get).toHaveBeenCalledWith('management/loggers'); + expect(axiosStub.post.calledWith('management/loggers/main', {configuredLevel: 'ERROR'})).toBeTruthy(); + expect(axiosStub.get.calledWith('management/loggers')).toBeTruthy(); }); }); diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/admin/metrics/metrics.component.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/admin/metrics/metrics.component.spec.ts.ejs index e31b8524d3ad..7a05f895e7bc 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/admin/metrics/metrics.component.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/admin/metrics/metrics.component.spec.ts.ejs @@ -1,5 +1,6 @@ import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils'; import axios from 'axios'; +import sinon from 'sinon'; import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'; import * as config from '@/shared/config/config'; @@ -9,7 +10,6 @@ import MetricsClass from '@/admin/metrics/metrics.component'; import MetricsService from '@/admin/metrics/metrics.service'; const localVue = createLocalVue(); -const mockedAxios: any = axios; config.initVueApp(localVue); <%_ if (enableTranslation) { _%> @@ -22,9 +22,9 @@ localVue.directive('b-modal', {}); localVue.directive('b-progress', {}); localVue.directive('b-progress-bar', {}); -jest.mock('axios', () => ({ - get: jest.fn() -})); +const axiosStub = { + get: sinon.stub(axios, 'get'), +}; describe('Metrics Component', () => { let wrapper: Wrapper; @@ -233,7 +233,7 @@ describe('Metrics Component', () => { }; beforeEach(() => { - mockedAxios.get.mockReturnValue(Promise.resolve({ data: { timers: [], gauges: []} })); + axiosStub.get.resolves({ data: { timers: [], gauges: []} }); wrapper = shallowMount(Metrics, { store, <%_ if (enableTranslation) { _%> @@ -255,15 +255,15 @@ describe('Metrics Component', () => { describe('refresh', () => { it('should call refresh on init', async () => { // GIVEN - mockedAxios.get.mockReturnValue(Promise.resolve({ data: response })); + axiosStub.get.resolves({ data: response }); // WHEN metricsComponent.refresh(); await metricsComponent.$nextTick(); // THEN - expect(mockedAxios.get).toHaveBeenCalledWith('management/jhimetrics'); - expect(mockedAxios.get).toHaveBeenCalledWith('management/threaddump'); + expect(axiosStub.get.calledWith('management/jhimetrics')).toBeTruthy(); + expect(axiosStub.get.calledWith('management/threaddump')).toBeTruthy(); expect(metricsComponent.metrics).toHaveProperty('jvm'); expect(metricsComponent.metrics).toEqual(response); expect(metricsComponent.threadStats).toEqual({ diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/admin/tracker/tracker.component.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/admin/tracker/tracker.component.spec.ts.ejs index 7b3f6146f393..e54d37cef711 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/admin/tracker/tracker.component.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/admin/tracker/tracker.component.spec.ts.ejs @@ -10,7 +10,6 @@ import <%=jhiPrefixCapitalized%>TrackerClass from '@/admin/tracker/tracker.compo import TrackerService from '@/admin/tracker/tracker.service'; const localVue = createLocalVue(); -const mockedAxios: any = axios; let trackerServiceStub: any; let listenerObserver: Observer; @@ -21,16 +20,16 @@ const i18n = config.initI18N(localVue); const store = config.initVueXStore(localVue); localVue.component('font-awesome-icon', FontAwesomeIcon); -jest.mock('axios', () => ({ - get: jest.fn() -})); +const axiosStub = { + get: sinon.stub(axios, 'get'), +}; describe('<%=jhiPrefixCapitalized%>Tracker', () => { let wrapper: Wrapper<<%=jhiPrefixCapitalized%>TrackerClass>; let <%=jhiPrefix%>Tracker: <%=jhiPrefixCapitalized%>TrackerClass; beforeEach(() => { - mockedAxios.get.mockReturnValue(Promise.resolve({ data: {} })); + axiosStub.get.resolves({ data: {} }); trackerServiceStub = sinon.createStubInstance(TrackerService); trackerServiceStub.receive = sinon.stub().callsFake(() => new Observable(observer => listenerObserver = observer)); wrapper = shallowMount<<%=jhiPrefixCapitalized%>TrackerClass>(<%=jhiPrefixCapitalized%>Tracker, { diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-edit.component.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-edit.component.spec.ts.ejs index 25da05fb92c0..e85fe62ac5cc 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-edit.component.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-edit.component.spec.ts.ejs @@ -3,6 +3,7 @@ const tsKeyId = generateTestEntityId(user.primaryKeyType); _%> import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils'; import axios from 'axios'; +import sinon from 'sinon'; import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'; import * as config from '@/shared/config/config'; @@ -13,7 +14,6 @@ import VueRouter from 'vue-router'; const localVue = createLocalVue(); localVue.use(VueRouter); -const mockedAxios: any = axios; config.initVueApp(localVue); <%_ if (enableTranslation) { _%> @@ -22,11 +22,11 @@ const i18n = config.initI18N(localVue); const store = config.initVueXStore(localVue); localVue.component('font-awesome-icon', FontAwesomeIcon); -jest.mock('axios', () => ({ - get: jest.fn(), - post: jest.fn(), - put: jest.fn() -})); +const axiosStub = { + get: sinon.stub(axios, 'get'), + post: sinon.stub(axios, 'post'), + put: sinon.stub(axios, 'put'), +}; describe('UserManagementEdit Component', () => { let wrapper: Wrapper; @@ -51,14 +51,14 @@ describe('UserManagementEdit Component', () => { describe('init', () => { it('Should load user', async () => { // GIVEN - mockedAxios.get.mockReturnValue(Promise.resolve({})); + axiosStub.get.resolves({}); // WHEN userManagementEdit.init(<%- tsKeyId %>); await userManagementEdit.$nextTick(); // THEN - expect(mockedAxios.get).toHaveBeenCalledWith('api/users/' + <%- tsKeyId %>); + expect(axiosStub.get.calledWith('api/users/' + <%- tsKeyId %>)).toBeTruthy(); }); }); @@ -66,14 +66,14 @@ describe('UserManagementEdit Component', () => { describe('initAuthorities', () => { it('Should load authorities', async () => { // GIVEN - mockedAxios.get.mockReturnValue(Promise.resolve({})); + axiosStub.get.resolves({}); // WHEN userManagementEdit.initAuthorities(); await userManagementEdit.$nextTick(); // THEN - expect(mockedAxios.get).toHaveBeenCalledWith(`api/users/authorities`); + expect(axiosStub.get.calledWith(`api/users/authorities`)).toBeTruthy(); }); }); @@ -81,14 +81,12 @@ describe('UserManagementEdit Component', () => { describe('save', () => { it('Should call update service on save for existing user', async () => { // GIVEN - mockedAxios.put.mockReturnValue( - Promise.resolve({ - headers: { - 'x-jhipsterapp-alert': '', - 'x-jhipsterapp-params': '', - }, - }) - ); + axiosStub.put.resolves({ + headers: { + 'x-jhipsterapp-alert': '', + 'x-jhipsterapp-params': '', + }, + }); userManagementEdit.userAccount = { id: <%- tsKeyId %>, authorities: [] }; // WHEN @@ -96,20 +94,18 @@ describe('UserManagementEdit Component', () => { await userManagementEdit.$nextTick(); // THEN - expect(mockedAxios.put).toHaveBeenCalledWith(`api/users`, { id: <%- tsKeyId %>, authorities: [] }); + expect(axiosStub.put.calledWith('api/users', { id: <%- tsKeyId %>, authorities: [] })).toBeTruthy(); expect(userManagementEdit.isSaving).toEqual(false); }); it('Should call create service on save for new user', async () => { // GIVEN - mockedAxios.post.mockReturnValue( - Promise.resolve({ - headers: { - 'x-jhipsterapp-alert': '', - 'x-jhipsterapp-params': '', - }, - }) - ); + axiosStub.post.resolves({ + headers: { + 'x-jhipsterapp-alert': '', + 'x-jhipsterapp-params': '', + }, + }); userManagementEdit.userAccount = { authorities: [] }; // WHEN @@ -117,7 +113,7 @@ describe('UserManagementEdit Component', () => { await userManagementEdit.$nextTick(); // THEN - expect(mockedAxios.post).toHaveBeenCalledWith(`api/users`, { authorities: []<% if (!enableTranslation) { %>, langKey: 'en'<% } %>}); + expect(axiosStub.post.calledWith('api/users', { authorities: []<% if (!enableTranslation) { %>, langKey: 'en'<% } %>})).toBeTruthy(); expect(userManagementEdit.isSaving).toEqual(false); }); }); diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-view.component.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-view.component.spec.ts.ejs index 6951b921296e..15c1f26bc349 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-view.component.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-view.component.spec.ts.ejs @@ -3,6 +3,7 @@ const tsKeyId = generateTestEntityId(user.primaryKeyType); _%> import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils'; import axios from 'axios'; +import sinon from 'sinon'; import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'; import * as config from '@/shared/config/config'; @@ -12,7 +13,6 @@ import UserManagementService from '@/admin/user-management/user-management.servi import {Authority} from '@/shared/security/authority'; const localVue = createLocalVue(); -const mockedAxios: any = axios; config.initVueApp(localVue); <%_ if (enableTranslation) { _%> @@ -23,10 +23,9 @@ localVue.component('font-awesome-icon', FontAwesomeIcon); localVue.component('b-badge', {}); localVue.component('router-link', {}); -jest.mock('axios', () => ({ - get: jest.fn(), - put: jest.fn() -})); +const axiosStub = { + get: sinon.stub(axios, 'get'), +}; describe('UserManagementView Component', () => { let wrapper: Wrapper; @@ -55,14 +54,14 @@ describe('UserManagementView Component', () => { lastModifiedDate: null, password: null }; - mockedAxios.get.mockReturnValue(Promise.resolve({ data: userData })); + axiosStub.get.resolves({ data: userData }); // WHEN userManagementView.init(<%- tsKeyId %>); await userManagementView.$nextTick(); // THEN - expect(mockedAxios.get).toHaveBeenCalledWith('api/users/' + <%- tsKeyId %>); + expect(axiosStub.get.calledWith('api/users/' + <%- tsKeyId %>)).toBeTruthy(); expect(userManagementView.user).toEqual(userData); }); }); diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts.ejs index 90474dc4d88f..0d3858cc9af3 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts.ejs @@ -3,6 +3,7 @@ const tsKeyId = generateTestEntityId(user.primaryKeyType); _%> import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils'; import axios from 'axios'; +import sinon from 'sinon'; import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'; import * as config from '@/shared/config/config'; @@ -11,7 +12,6 @@ import UserManagementClass from '@/admin/user-management/user-management.compone import UserManagementService from '@/admin/user-management/user-management.service'; const localVue = createLocalVue(); -const mockedAxios: any = axios; config.initVueApp(localVue); <%_ if (enableTranslation) { _%> @@ -23,11 +23,11 @@ localVue.component('router-link', {}); localVue.component('jhi-sort-indicator', {}); localVue.directive('b-modal', {}); -jest.mock('axios', () => ({ - get: jest.fn(), - put: jest.fn(), - delete: jest.fn() -})); +const axiosStub = { + delete: sinon.stub(axios, 'delete'), + get: sinon.stub(axios, 'get'), + put: sinon.stub(axios, 'put'), +}; describe('UserManagement Component', () => { let wrapper: Wrapper; @@ -40,9 +40,9 @@ describe('UserManagement Component', () => { }; beforeEach(() => { - mockedAxios.put.mockReset(); - mockedAxios.get.mockReset(); - mockedAxios.get.mockReturnValue(Promise.resolve({ headers: {} })); + axiosStub.put.reset(); + axiosStub.get.reset(); + axiosStub.get.resolves({ headers: {} }); store.commit('authenticated', account); wrapper = shallowMount(UserManagement, { @@ -70,36 +70,34 @@ describe('UserManagement Component', () => { await userManagement.$nextTick(); // THEN - expect(mockedAxios.get).toHaveBeenCalledWith(`api/users<%_ if (databaseType !== 'cassandra') { _%>?sort=id,asc&page=0&size=20<%_ } _%>`); + expect(axiosStub.get.calledWith(`api/users<%_ if (databaseType !== 'cassandra') { _%>?sort=id,asc&page=0&size=20<%_ } _%>`)).toBeTruthy(); }); }); describe('setActive', () => { it('Should update user and call load all', async () => { // GIVEN - mockedAxios.put.mockReturnValue(Promise.resolve({})); + axiosStub.put.resolves({}); // WHEN userManagement.setActive({ id: <%- tsKeyId %> }, true); await userManagement.$nextTick(); // THEN - expect(mockedAxios.put).toHaveBeenCalledWith(`api/users`, { id: <%- tsKeyId %>, activated: true }); - expect(mockedAxios.get).toHaveBeenCalledWith(`api/users<%_ if (databaseType !== 'cassandra') { _%>?sort=id,asc&page=0&size=20<%_ } _%>`); + expect(axiosStub.put.calledWith(`api/users`, { id: <%- tsKeyId %>, activated: true })).toBeTruthy(); + expect(axiosStub.get.calledWith(`api/users<%_ if (databaseType !== 'cassandra') { _%>?sort=id,asc&page=0&size=20<%_ } _%>`)).toBeTruthy(); }); }); describe('confirmDelete', () => { it('Should call delete service on confirmDelete', async () => { // GIVEN - mockedAxios.delete.mockReturnValue( - Promise.resolve({ - headers: { - 'x-jhipsterapp-alert': '', - 'x-jhipsterapp-params': '', - }, - }) - ); + axiosStub.delete.resolves({ + headers: { + 'x-jhipsterapp-alert': '', + 'x-jhipsterapp-params': '', + }, + }); // WHEN userManagement.prepareRemove({ login: <%- tsKeyId %> }); @@ -107,8 +105,8 @@ describe('UserManagement Component', () => { await userManagement.$nextTick(); // THEN - expect(mockedAxios.delete).toHaveBeenCalledWith('api/users/' + <%- tsKeyId %>); - expect(mockedAxios.get).toHaveBeenCalledWith(`api/users<%_ if (databaseType !== 'cassandra') { _%>?sort=id,asc&page=0&size=20<%_ } _%>`); + expect(axiosStub.delete.calledWith('api/users/' + <%- tsKeyId %>)).toBeTruthy(); + expect(axiosStub.get.calledWith(`api/users<%_ if (databaseType !== 'cassandra') { _%>?sort=id,asc&page=0&size=20<%_ } _%>`)).toBeTruthy(); }); }); <%_ if (databaseType !== 'cassandra') { _%> diff --git a/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.service.spec.ts.ejs b/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.service.spec.ts.ejs index 3fe2e1c70803..53bb51bb10d0 100644 --- a/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.service.spec.ts.ejs +++ b/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.service.spec.ts.ejs @@ -22,19 +22,20 @@ const enumImports = generateEntityClientEnumImports(fields); _%> /* tslint:disable max-line-length */ import axios from 'axios'; +import sinon from 'sinon' <%_ if (fieldsContainDate) { _%> import dayjs from 'dayjs'; <%_ } _%> -import * as config from '@/shared/config/config'; +<%_ if (fieldsContainLocalDate || fieldsContainInstant || fieldsContainZonedDateTime) { _%> import { <%_ if (fieldsContainLocalDate) { _%>DATE_FORMAT,<%_ } if (fieldsContainInstant || fieldsContainZonedDateTime) {_%> DATE_TIME_FORMAT<%_ } _%> } from '@/shared/date/filters'; +<%_ } _%> import <%= entityAngularName %>Service from '@/entities/<%= entityFolderName %>/<%= entityFileName %>.service'; import { <%= entityAngularName %> } from '@/shared/model/<%= entityModelFileName %>.model'; <%_ enumImports.forEach( (importedPath, importedType) => { _%> import { <%- importedType %> } from '<%- importedPath.replace('app/', '@/') %>'; <%_ }); _%> -const mockedAxios: any = axios; const error = { response: { status: null, @@ -44,27 +45,26 @@ const error = { } }; -jest.mock('axios', () => ({ - get: jest.fn(), - post: jest.fn(), - put: jest.fn(), - delete: jest.fn() -})); +const axiosStub = { + get: sinon.stub(axios, 'get'), + post: sinon.stub(axios, 'post'), + put: sinon.stub(axios, 'put'), + delete: sinon.stub(axios, 'delete'), +}; describe('Service Tests', () => { - describe('<%= entityAngularName %> Service', () => { let service: <%= entityAngularName %>Service; let elemDefault; <%_ if (fieldsContainDate) { _%> let currentDate: Date; <%_ } _%> + beforeEach(() => { service = new <%= entityAngularName %>Service(); <%_ if (fieldsContainDate) { _%> currentDate = new Date(); <%_ } _%> - elemDefault = new <%= entityAngularName %>( <%_ if (primaryKeyType === 'String' || primaryKeyType === 'UUID') { _%> 'ID', @@ -107,7 +107,7 @@ describe('Service Tests', () => { <%_ } _%> <%_ }) _%> }, elemDefault); - mockedAxios.get.mockReturnValue(Promise.resolve({ data: returnedFromService })); + axiosStub.get.resolves({ data: returnedFromService }); return service .find(<%- tsKeyId %>).then((res) => { @@ -116,7 +116,7 @@ describe('Service Tests', () => { }); it('should not find an element', async () => { - mockedAxios.get.mockReturnValue(Promise.reject(error)); + axiosStub.get.rejects(error); return service.find(<%- tsKeyId %>) .then() .catch(err => { @@ -152,14 +152,14 @@ describe('Service Tests', () => { <%_ }) _%> }, returnedFromService); - mockedAxios.post.mockReturnValue(Promise.resolve({ data: returnedFromService })); + axiosStub.post.resolves({ data: returnedFromService }); return service.create({}).then((res) => { expect(res).toMatchObject(expected); }); }); it('should not create a <%= entityAngularName %>', async () => { - mockedAxios.post.mockReturnValue(Promise.reject(error)); + axiosStub.post.rejects(error); return service.create({}) .then() @@ -200,7 +200,7 @@ describe('Service Tests', () => { <%_ } _%> <%_ }) _%> }, returnedFromService); - mockedAxios.put.mockReturnValue(Promise.resolve({ data: returnedFromService })); + axiosStub.put.resolves({ data: returnedFromService }); return service.update(expected).then((res) => { expect(res).toMatchObject(expected); @@ -208,7 +208,7 @@ describe('Service Tests', () => { }); it('should not update a <%= entityAngularName %>', async () => { - mockedAxios.put.mockReturnValue(Promise.reject(error)); + axiosStub.put.rejects(error); return service.update({}) .then() @@ -249,14 +249,14 @@ describe('Service Tests', () => { <%_ } _%> <%_ }) _%> }, returnedFromService); - mockedAxios.get.mockReturnValue(Promise.resolve([returnedFromService])); + axiosStub.get.resolves([returnedFromService]); return service.retrieve(<% if (pagination !== 'no') { %>{ sort: {}, page: 0, size: 10 }<% } %>).then((res) => { expect(res).toContainEqual(expected); }); }); it('should not return a list of <%= entityAngularName %>', async () => { - mockedAxios.get.mockReturnValue(Promise.reject(error)); + axiosStub.get.rejects(error); return service.retrieve() .then() @@ -267,14 +267,14 @@ describe('Service Tests', () => { <%_ if (!readOnly) { _%> it('should delete a <%= entityAngularName %>', async () => { - mockedAxios.delete.mockReturnValue(Promise.resolve({ok: true})); + axiosStub.delete.resolves({ok: true}); return service.delete(<%- tsKeyId %>).then((res) => { expect(res.ok).toBeTruthy(); }); }); it('should not delete a <%= entityAngularName %>', async () => { - mockedAxios.delete.mockReturnValue(Promise.reject(error)); + axiosStub.delete.rejects(error); return service.delete(<%- tsKeyId %>) .then() From 2ba36d51421085c51f81e52675246d983d9418a4 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Sat, 14 Nov 2020 08:47:11 -0300 Subject: [PATCH 0012/1179] Change upgrade generator to use legacy-peer-deps --- generators/upgrade/index.js | 10 ++-- test/upgrade.spec.js | 97 +++++++++++++++---------------------- 2 files changed, 44 insertions(+), 63 deletions(-) diff --git a/generators/upgrade/index.js b/generators/upgrade/index.js index f0000d6ad3e7..597ad50cd2bd 100644 --- a/generators/upgrade/index.js +++ b/generators/upgrade/index.js @@ -199,8 +199,8 @@ module.exports = class extends BaseGenerator { const commandPrefix = 'npm show'; const pkgInfo = shelljs.exec(`${commandPrefix} ${packageName} version`, { silent: this.silent }); if (pkgInfo.stderr) { - this.warning(`Something went wrong fetching the latest ${packageName} version number...\n${pkgInfo.stderr}`); - this.error('Exiting process'); + this.warning(pkgInfo.stderr); + throw new Error(`Something went wrong fetching the latest ${packageName} version number...\n${pkgInfo.stderr}`); } const msg = pkgInfo.stdout; return msg.replace('\n', ''); @@ -211,7 +211,7 @@ module.exports = class extends BaseGenerator { const commandPrefix = 'npm install'; const devDependencyParam = '--save-dev'; const noPackageLockParam = '--no-package-lock'; - const generatorCommand = `${commandPrefix} ${npmPackage}@${version} ${devDependencyParam} ${noPackageLockParam} --ignore-scripts`; + const generatorCommand = `${commandPrefix} ${npmPackage}@${version} ${devDependencyParam} ${noPackageLockParam} --ignore-scripts --legacy-peer-deps`; this.info(generatorCommand); const npmIntall = shelljs.exec(generatorCommand, { silent: this.silent }); @@ -324,8 +324,8 @@ module.exports = class extends BaseGenerator { const gitStatus = this.gitExec(['status', '--porcelain'], { silent: this.silent }); if (gitStatus.code !== 0) this.error(`Unable to check for local changes:\n${gitStatus.stdout} ${gitStatus.stderr}`); if (gitStatus.stdout) { - this.warning(' local changes found.\n\tPlease commit/stash them before upgrading'); - this.error('Exiting process'); + this.warning(gitStatus.stdout); + throw new Error(' local changes found.\n\tPlease commit/stash them before upgrading'); } }, diff --git a/test/upgrade.spec.js b/test/upgrade.spec.js index 973457734df9..b01bfe571179 100644 --- a/test/upgrade.spec.js +++ b/test/upgrade.spec.js @@ -7,24 +7,20 @@ const expect = require('chai').expect; const expectedFiles = require('./utils/expected-files'); const packageJson = require('../package.json'); const constants = require('../generators/generator-constants'); +const { prepareTempDir } = require('./utils/utils'); const ANGULAR = constants.SUPPORTED_CLIENT_FRAMEWORKS.ANGULAR; describe('JHipster upgrade generator', function () { this.timeout(400000); + describe('default application', () => { - const cwd = process.cwd(); - before(done => { - let workingDirectory; - helpers - .run(path.join(__dirname, '../generators/app')) + let cleanup; + before(() => { + cleanup = prepareTempDir(); + return helpers + .create(path.join(__dirname, '../generators/app'), { tmpdir: false }) .withOptions({ skipInstall: true, skipChecks: true, fromCli: true }) - .inTmpDir(dir => { - /* eslint-disable-next-line no-console */ - console.log(`Generating JHipster application in directory: ${dir}`); - // Save directory, in order to run the upgrade generator in the same directory - workingDirectory = dir; - }) .withPrompts({ baseName: 'jhipster', clientFramework: ANGULAR, @@ -47,24 +43,22 @@ describe('JHipster upgrade generator', function () { serverSideOptions: [], upgradeConfig: false, }) - .on('end', () => { - helpers - .run(path.join(__dirname, '../generators/upgrade')) + .run() + .then(() => { + return helpers + .create(path.join(__dirname, '../generators/upgrade'), { tmpdir: false }) .withOptions({ fromCli: true, force: true, silent: false, targetVersion: packageJson.version, }) - .inTmpDir(() => { - /* eslint-disable-next-line no-console */ - console.log('Upgrading the JHipster application'); - process.chdir(workingDirectory); - }) - .on('end', done); + .run(); }); }); + after(() => cleanup()); + it('creates expected files for default configuration', () => { assert.file(expectedFiles.common); assert.file(expectedFiles.server); @@ -82,36 +76,29 @@ describe('JHipster upgrade generator', function () { // - master: merge commit of jhipster_upgrade expect(commitsCount).to.equal('5'); }); - - after(() => { - process.chdir(cwd); - }); }); describe('blueprint application', () => { - const cwd = process.cwd(); const blueprintName = 'generator-jhipster-sample-blueprint'; const blueprintVersion = '0.1.1'; - before(done => { - let workingDirectory; - helpers - .run(path.join(__dirname, '../generators/app')) + let cleanup; + before(() => { + cleanup = prepareTempDir(); + const dir = process.cwd(); + /* eslint-disable-next-line no-console */ + console.log(`Generating JHipster application in directory: ${dir}`); + // Fake the presence of the blueprint in node_modules: we don't install it, but we need its version + const packagejs = { + name: blueprintName, + version: blueprintVersion, + }; + const fakeBlueprintModuleDir = path.join(dir, `node_modules/${blueprintName}`); + fse.ensureDirSync(path.join(fakeBlueprintModuleDir, 'generators', 'fake')); + fse.writeJsonSync(path.join(fakeBlueprintModuleDir, 'package.json'), packagejs); + // Create an fake generator, otherwise env.lookup doesn't find it. + fse.writeFileSync(path.join(fakeBlueprintModuleDir, 'generators', 'fake', 'index.js'), ''); + return helpers + .create(path.join(__dirname, '../generators/app'), { tmpdir: false }) .withOptions({ skipInstall: true, skipChecks: true, fromCli: true, blueprints: blueprintName }) - .inTmpDir(dir => { - /* eslint-disable-next-line no-console */ - console.log(`Generating JHipster application in directory: ${dir}`); - // Save directory, in order to run the upgrade generator in the same directory - workingDirectory = dir; - // Fake the presence of the blueprint in node_modules: we don't install it, but we need its version - const packagejs = { - name: blueprintName, - version: blueprintVersion, - }; - const fakeBlueprintModuleDir = path.join(dir, `node_modules/${blueprintName}`); - fse.ensureDirSync(path.join(fakeBlueprintModuleDir, 'generators', 'fake')); - fse.writeJsonSync(path.join(fakeBlueprintModuleDir, 'package.json'), packagejs); - // Create an fake generator, otherwise env.lookup doesn't find it. - fse.writeFileSync(path.join(fakeBlueprintModuleDir, 'generators', 'fake', 'index.js'), ''); - }) .withPrompts({ baseName: 'jhipster', clientFramework: ANGULAR, @@ -134,9 +121,10 @@ describe('JHipster upgrade generator', function () { serverSideOptions: [], upgradeConfig: false, }) - .on('end', () => { - helpers - .run(path.join(__dirname, '../generators/upgrade')) + .run() + .then(() => { + return helpers + .create(path.join(__dirname, '../generators/upgrade'), { tmpdir: false }) .withOptions({ fromCli: true, force: true, @@ -144,15 +132,12 @@ describe('JHipster upgrade generator', function () { skipChecks: true, targetVersion: packageJson.version, }) - .inTmpDir(() => { - /* eslint-disable-next-line no-console */ - console.log('Upgrading the JHipster application'); - process.chdir(workingDirectory); - }) - .on('end', done); + .run(); }); }); + after(() => cleanup()); + it('creates expected files for default configuration', () => { assert.file(expectedFiles.common); assert.file(expectedFiles.server); @@ -177,9 +162,5 @@ describe('JHipster upgrade generator', function () { }); assert.fileContent('package.json', new RegExp(`"${blueprintName}": "${blueprintVersion}"`)); }); - - after(() => { - process.chdir(cwd); - }); }); }); From 8c6e357d47703e344886afcbcb5c7b58199903d3 Mon Sep 17 00:00:00 2001 From: Sendil Kumar N Date: Mon, 23 Nov 2020 16:32:23 +0100 Subject: [PATCH 0013/1179] remove services prefix for istio gateway remove extra services prefix for istio gateway. --- generators/kubernetes/templates/istio/gateway.yml.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/kubernetes/templates/istio/gateway.yml.ejs b/generators/kubernetes/templates/istio/gateway.yml.ejs index 1b7720a4716d..6e79ca880f1e 100644 --- a/generators/kubernetes/templates/istio/gateway.yml.ejs +++ b/generators/kubernetes/templates/istio/gateway.yml.ejs @@ -58,7 +58,7 @@ spec: <%_ appConfigs.filter(config => config.baseName !== app.baseName).forEach(config => { _%> - match: - uri: - prefix: /services/<%= config.baseName.toLowerCase() %>/ + prefix: /<%= config.baseName.toLowerCase() %>/ route: - destination: host: <%= config.baseName.toLowerCase() %> From 437583703ab4ae661844dbe892cb7404c9a300e0 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Fri, 13 Nov 2020 09:10:01 -0300 Subject: [PATCH 0014/1179] Update package.json bin. (Updated by npm.) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bfbd7b23dc41..903a6cf4ae6b 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ }, "main": "cli/index.js", "bin": { - "jhipster": "./cli/jhipster.js" + "jhipster": "cli/jhipster.js" }, "files": [ "cli", From cc5419f8b92b283f38cf4d765ac641ab6935f21a Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Mon, 23 Nov 2020 12:47:24 -0300 Subject: [PATCH 0015/1179] Generate .npmrc with `legacy-peer-deps = true` for vue projects --- generators/client/files-vue.js | 1 + generators/client/templates/vue/.npmrc.ejs | 1 + 2 files changed, 2 insertions(+) create mode 100644 generators/client/templates/vue/.npmrc.ejs diff --git a/generators/client/files-vue.js b/generators/client/files-vue.js index 4f5462ba8454..3a5d60e09f8f 100644 --- a/generators/client/files-vue.js +++ b/generators/client/files-vue.js @@ -29,6 +29,7 @@ const vueFiles = { common: [ { templates: [ + '.npmrc', 'package.json', 'tsconfig.json', '.postcssrc.js', diff --git a/generators/client/templates/vue/.npmrc.ejs b/generators/client/templates/vue/.npmrc.ejs new file mode 100644 index 000000000000..80bcbed90c4f --- /dev/null +++ b/generators/client/templates/vue/.npmrc.ejs @@ -0,0 +1 @@ +legacy-peer-deps = true From 2bc03d30471c61e0b396cdeab6ef607577061fc8 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Mon, 23 Nov 2020 12:48:13 -0300 Subject: [PATCH 0016/1179] Generate .npmrc with `legacy-peer-deps = true` for react projects --- generators/client/files-react.js | 1 + generators/client/templates/react/.npmrc.ejs | 1 + 2 files changed, 2 insertions(+) create mode 100644 generators/client/templates/react/.npmrc.ejs diff --git a/generators/client/files-react.js b/generators/client/files-react.js index 298617313008..a458c6415dba 100644 --- a/generators/client/files-react.js +++ b/generators/client/files-react.js @@ -28,6 +28,7 @@ const files = { common: [ { templates: [ + '.npmrc', 'package.json', '.eslintrc.json', 'tsconfig.json', diff --git a/generators/client/templates/react/.npmrc.ejs b/generators/client/templates/react/.npmrc.ejs new file mode 100644 index 000000000000..80bcbed90c4f --- /dev/null +++ b/generators/client/templates/react/.npmrc.ejs @@ -0,0 +1 @@ +legacy-peer-deps = true From e1a9b0ef7d7d210f10c7fefe96348b9dd870d582 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Mon, 23 Nov 2020 12:38:43 -0300 Subject: [PATCH 0017/1179] Generate .npmrc with `legacy-peer-deps = true` for angular projects Peer dependencies are broken since upgrading to angular 11. --- generators/client/files-angular.js | 1 + generators/client/templates/angular/.npmrc.ejs | 1 + test/utils/expected-files.js | 1 + 3 files changed, 3 insertions(+) create mode 100644 generators/client/templates/angular/.npmrc.ejs diff --git a/generators/client/files-angular.js b/generators/client/files-angular.js index 329a146452d8..184fe03be27d 100644 --- a/generators/client/files-angular.js +++ b/generators/client/files-angular.js @@ -28,6 +28,7 @@ const files = { common: [ { templates: [ + '.npmrc', 'package.json', 'tsconfig.json', 'tsconfig.app.json', diff --git a/generators/client/templates/angular/.npmrc.ejs b/generators/client/templates/angular/.npmrc.ejs new file mode 100644 index 000000000000..80bcbed90c4f --- /dev/null +++ b/generators/client/templates/angular/.npmrc.ejs @@ -0,0 +1 @@ +legacy-peer-deps = true diff --git a/test/utils/expected-files.js b/test/utils/expected-files.js index afc6b56e7a86..26efb8655eb2 100644 --- a/test/utils/expected-files.js +++ b/test/utils/expected-files.js @@ -383,6 +383,7 @@ const expectedFiles = { 'angular.json', 'ngsw-config.json', '.eslintrc.json', + '.npmrc', 'package.json', '.browserslistrc', `${CLIENT_MAIN_SRC_DIR}404.html`, From ab83fddfc99baf5db9d998ae637579189b519d1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Nov 2020 06:33:46 +0000 Subject: [PATCH 0018/1179] chore(deps-dev): bump @typescript-eslint/eslint-plugin Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.8.1 to 4.8.2. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.8.2/packages/eslint-plugin) Signed-off-by: dependabot[bot] --- generators/client/templates/angular/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/templates/angular/package.json b/generators/client/templates/angular/package.json index 4a64bd8cf3c8..6f2d87dbbc3d 100644 --- a/generators/client/templates/angular/package.json +++ b/generators/client/templates/angular/package.json @@ -21,7 +21,7 @@ "@angular-builders/custom-webpack": "11.0.0-beta.1", "@angular-eslint/eslint-plugin": "0.6.0-beta.0", "@types/jest": "26.0.15", - "@typescript-eslint/eslint-plugin": "4.8.1", + "@typescript-eslint/eslint-plugin": "4.8.2", "browser-sync": "2.26.13", "browser-sync-webpack-plugin": "2.2.2", "copy-webpack-plugin": "6.3.2", From 57a688b908e39ae367af60d100be45aca6718cc1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Nov 2020 06:39:55 +0000 Subject: [PATCH 0019/1179] chore(deps-dev): bump lint-staged in /generators/client/templates/common Bumps [lint-staged](https://github.com/okonet/lint-staged) from 10.5.1 to 10.5.2. - [Release notes](https://github.com/okonet/lint-staged/releases) - [Commits](https://github.com/okonet/lint-staged/compare/v10.5.1...v10.5.2) Signed-off-by: dependabot[bot] --- generators/client/templates/common/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/templates/common/package.json b/generators/client/templates/common/package.json index f54b09eea8fc..744647242629 100644 --- a/generators/client/templates/common/package.json +++ b/generators/client/templates/common/package.json @@ -5,7 +5,7 @@ "typescript": "4.0.5", "wait-on": "5.2.0", "husky": "4.3.0", - "lint-staged": "10.5.1" + "lint-staged": "10.5.2" }, "dependencies": { "dayjs": "1.9.6" From 2393ef4843bd6d584644161086a818b1cca7c1e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Nov 2020 06:40:36 +0000 Subject: [PATCH 0020/1179] chore(deps-dev): bump cypress in /generators/client/templates/common Bumps [cypress](https://github.com/cypress-io/cypress) from 5.6.0 to 6.0.0. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/.releaserc.base.js) - [Commits](https://github.com/cypress-io/cypress/compare/v5.6.0...v6.0.0) Signed-off-by: dependabot[bot] --- generators/client/templates/common/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/templates/common/package.json b/generators/client/templates/common/package.json index f54b09eea8fc..ae870cdeb8bf 100644 --- a/generators/client/templates/common/package.json +++ b/generators/client/templates/common/package.json @@ -1,7 +1,7 @@ { "devDependencies": { "concurrently": "5.3.0", - "cypress": "5.6.0", + "cypress": "6.0.0", "typescript": "4.0.5", "wait-on": "5.2.0", "husky": "4.3.0", From 178379c5d62f19311b4d046600a8fce5395eeb5e Mon Sep 17 00:00:00 2001 From: qmonmert Date: Tue, 24 Nov 2020 15:24:20 +0100 Subject: [PATCH 0021/1179] Localization key metrics.jvm.http.table.max not created in all languages --- .../languages/templates/src/main/webapp/i18n/al/metrics.json | 3 ++- .../templates/src/main/webapp/i18n/ar-ly/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/bn/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/by/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/ca/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/cs/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/da/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/de/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/el/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/es/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/et/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/fa/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/gl/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/hi/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/hu/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/hy/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/in/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/it/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/ja/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/ko/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/mr/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/my/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/nl/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/pl/metrics.json | 3 ++- .../templates/src/main/webapp/i18n/pt-pt/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/ro/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/ru/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/sk/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/sr/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/sv/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/ta/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/th/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/tr/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/ua/metrics.json | 3 ++- .../templates/src/main/webapp/i18n/uz-Latn-uz/metrics.json | 3 ++- .../languages/templates/src/main/webapp/i18n/vi/metrics.json | 3 ++- .../templates/src/main/webapp/i18n/zh-cn/metrics.json | 3 ++- .../templates/src/main/webapp/i18n/zh-tw/metrics.json | 3 ++- 38 files changed, 76 insertions(+), 38 deletions(-) diff --git a/generators/languages/templates/src/main/webapp/i18n/al/metrics.json b/generators/languages/templates/src/main/webapp/i18n/al/metrics.json index bd349a721a7e..3c1199906bb4 100644 --- a/generators/languages/templates/src/main/webapp/i18n/al/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/al/metrics.json @@ -46,7 +46,8 @@ "code": "Code", "count": "Numëri", "mean": "Mesi", - "average": "Mesatarja" + "average": "Mesatarja", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/ar-ly/metrics.json b/generators/languages/templates/src/main/webapp/i18n/ar-ly/metrics.json index 9d804947c571..f5bd858a988a 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ar-ly/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/ar-ly/metrics.json @@ -46,7 +46,8 @@ "code": "Code", "count": "Count", "mean": "Mean", - "average": "Average" + "average": "Average", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/bn/metrics.json b/generators/languages/templates/src/main/webapp/i18n/bn/metrics.json index 9d804947c571..f5bd858a988a 100644 --- a/generators/languages/templates/src/main/webapp/i18n/bn/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/bn/metrics.json @@ -46,7 +46,8 @@ "code": "Code", "count": "Count", "mean": "Mean", - "average": "Average" + "average": "Average", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/by/metrics.json b/generators/languages/templates/src/main/webapp/i18n/by/metrics.json index e84359131451..484a64e53b9c 100644 --- a/generators/languages/templates/src/main/webapp/i18n/by/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/by/metrics.json @@ -46,7 +46,8 @@ "code": "Код", "count": "Колькасць", "mean": "Сярэдняе", - "average": "Сярэдняе" + "average": "Сярэдняе", + "max": "Max" }, "code": { "ok": "Ок", diff --git a/generators/languages/templates/src/main/webapp/i18n/ca/metrics.json b/generators/languages/templates/src/main/webapp/i18n/ca/metrics.json index d6be5e54c85f..967d783bf869 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ca/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/ca/metrics.json @@ -46,7 +46,8 @@ "code": "Codi", "count": "Contador", "mean": "mitja", - "average": "mitjana" + "average": "mitjana", + "max": "Max" }, "code": { "ok": "Correcte", diff --git a/generators/languages/templates/src/main/webapp/i18n/cs/metrics.json b/generators/languages/templates/src/main/webapp/i18n/cs/metrics.json index a5b1ac74e0bf..2463865e4202 100644 --- a/generators/languages/templates/src/main/webapp/i18n/cs/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/cs/metrics.json @@ -46,7 +46,8 @@ "code": "Kód", "count": "Počet", "mean": "Průměr (Mean)", - "average": "Průměr (Average)" + "average": "Průměr (Average)", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/da/metrics.json b/generators/languages/templates/src/main/webapp/i18n/da/metrics.json index e87acfc76816..3c023f7526e8 100644 --- a/generators/languages/templates/src/main/webapp/i18n/da/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/da/metrics.json @@ -46,7 +46,8 @@ "code": "Kode", "count": "Antal", "mean": "Middel", - "average": "Gennemsnit" + "average": "Gennemsnit", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/de/metrics.json b/generators/languages/templates/src/main/webapp/i18n/de/metrics.json index 63e36ecb10a4..3324fe933465 100644 --- a/generators/languages/templates/src/main/webapp/i18n/de/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/de/metrics.json @@ -46,7 +46,8 @@ "code": "Codierung", "count": "Anzahl", "mean": "Durchschnittswert", - "average": "Mittelwert" + "average": "Mittelwert", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/el/metrics.json b/generators/languages/templates/src/main/webapp/i18n/el/metrics.json index 18861858a849..f9c8d0825d74 100644 --- a/generators/languages/templates/src/main/webapp/i18n/el/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/el/metrics.json @@ -46,7 +46,8 @@ "code": "Code", "count": "Αριθμός", "mean": "Μέσο", - "average": "Μέσος ορος" + "average": "Μέσος ορος", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/es/metrics.json b/generators/languages/templates/src/main/webapp/i18n/es/metrics.json index c23f2e85b816..328e51f1f21f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/es/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/es/metrics.json @@ -46,7 +46,8 @@ "code": "Código", "count": "Recuento", "mean": "Media", - "average": "Promedio" + "average": "Promedio", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/et/metrics.json b/generators/languages/templates/src/main/webapp/i18n/et/metrics.json index 1493d16fc613..9fab819dbd34 100644 --- a/generators/languages/templates/src/main/webapp/i18n/et/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/et/metrics.json @@ -46,7 +46,8 @@ "code": "Kood", "count": "Arv", "mean": "Keskväärtus", - "average": "Keskmine" + "average": "Keskmine", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/fa/metrics.json b/generators/languages/templates/src/main/webapp/i18n/fa/metrics.json index de9a1b7917c5..aa7c7a806777 100644 --- a/generators/languages/templates/src/main/webapp/i18n/fa/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/fa/metrics.json @@ -46,7 +46,8 @@ "code": "کد", "count": "تعداد", "mean": "حد وسط", - "average": "میانگین" + "average": "میانگین", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/gl/metrics.json b/generators/languages/templates/src/main/webapp/i18n/gl/metrics.json index 417ebf0b0dde..9c897dc2a63b 100644 --- a/generators/languages/templates/src/main/webapp/i18n/gl/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/gl/metrics.json @@ -46,7 +46,8 @@ "code": "Código", "count": "Reconto", "mean": "Mean", - "average": "Average" + "average": "Average", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/hi/metrics.json b/generators/languages/templates/src/main/webapp/i18n/hi/metrics.json index 46137aa1cd93..fcf6fb303d9f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hi/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/hi/metrics.json @@ -46,7 +46,8 @@ "code": "Code", "count": "गिनती", "mean": "Mean", - "average": "औसत" + "average": "औसत", + "max": "Max" }, "code": { "ok": "ठीक हैं", diff --git a/generators/languages/templates/src/main/webapp/i18n/hu/metrics.json b/generators/languages/templates/src/main/webapp/i18n/hu/metrics.json index ddd80dd58a46..d030a14d9d2c 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hu/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/hu/metrics.json @@ -46,7 +46,8 @@ "code": "Code", "count": "Count", "mean": "Mean", - "average": "Average" + "average": "Average", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/hy/metrics.json b/generators/languages/templates/src/main/webapp/i18n/hy/metrics.json index 2c8f58b474e3..a8a3f07bfc1e 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hy/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/hy/metrics.json @@ -46,7 +46,8 @@ "code": "Code", "count": "Count", "mean": "Mean", - "average": "Average" + "average": "Average", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/in/metrics.json b/generators/languages/templates/src/main/webapp/i18n/in/metrics.json index 04e48580d5dc..88421d66478d 100644 --- a/generators/languages/templates/src/main/webapp/i18n/in/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/in/metrics.json @@ -46,7 +46,8 @@ "code": "Code", "count": "Count", "mean": "Mean", - "average": "Average" + "average": "Average", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/it/metrics.json b/generators/languages/templates/src/main/webapp/i18n/it/metrics.json index 3bcdd19e1b18..a1929828ac74 100644 --- a/generators/languages/templates/src/main/webapp/i18n/it/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/it/metrics.json @@ -46,7 +46,8 @@ "code": "Codice", "count": "Numero", "mean": "Mediana", - "average": "Media" + "average": "Media", + "max": "Massima" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/ja/metrics.json b/generators/languages/templates/src/main/webapp/i18n/ja/metrics.json index 4b2d431beb0d..4a0d18c04796 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ja/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/ja/metrics.json @@ -46,7 +46,8 @@ "code": "Code", "count": "Count", "mean": "Mean", - "average": "Average" + "average": "Average", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/ko/metrics.json b/generators/languages/templates/src/main/webapp/i18n/ko/metrics.json index 5d9744153192..34a7511ddcaa 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ko/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/ko/metrics.json @@ -46,7 +46,8 @@ "code": "상태코드", "count": "횟수", "mean": "대표값(Mean)", - "average": "평균(Average)" + "average": "평균(Average)", + "max": "Max" }, "code": { "ok": "성공(Ok)", diff --git a/generators/languages/templates/src/main/webapp/i18n/mr/metrics.json b/generators/languages/templates/src/main/webapp/i18n/mr/metrics.json index c68d8082ae03..79d8ebe04e94 100644 --- a/generators/languages/templates/src/main/webapp/i18n/mr/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/mr/metrics.json @@ -46,7 +46,8 @@ "code": "कोड", "count": "गणना", "mean": "मध्य ", - "average": "सरासरी" + "average": "सरासरी", + "max": "Max" }, "code": { "ok": "ठीक ", diff --git a/generators/languages/templates/src/main/webapp/i18n/my/metrics.json b/generators/languages/templates/src/main/webapp/i18n/my/metrics.json index 9d804947c571..f5bd858a988a 100644 --- a/generators/languages/templates/src/main/webapp/i18n/my/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/my/metrics.json @@ -46,7 +46,8 @@ "code": "Code", "count": "Count", "mean": "Mean", - "average": "Average" + "average": "Average", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/nl/metrics.json b/generators/languages/templates/src/main/webapp/i18n/nl/metrics.json index 72cf58441654..958c11c6c6c1 100644 --- a/generators/languages/templates/src/main/webapp/i18n/nl/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/nl/metrics.json @@ -46,7 +46,8 @@ "code": "Code", "count": "Aantal", "mean": "Mediaan", - "average": "Gemiddelde" + "average": "Gemiddelde", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/pl/metrics.json b/generators/languages/templates/src/main/webapp/i18n/pl/metrics.json index d8326f32b147..09100c1f8434 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pl/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/pl/metrics.json @@ -46,7 +46,8 @@ "code": "Kod", "count": "Liczba", "mean": "Średnia", - "average": "Średnia" + "average": "Średnia", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/pt-pt/metrics.json b/generators/languages/templates/src/main/webapp/i18n/pt-pt/metrics.json index c271f0e0c1ea..13679fa222b4 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pt-pt/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/pt-pt/metrics.json @@ -46,7 +46,8 @@ "code": "Código", "count": "Contagem", "mean": "Mediana", - "average": "Média" + "average": "Média", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/ro/metrics.json b/generators/languages/templates/src/main/webapp/i18n/ro/metrics.json index 5bcb6f59ce0a..c870b30750ec 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ro/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/ro/metrics.json @@ -46,7 +46,8 @@ "code": "Cod", "count": "Număr", "mean": "Medie aritmetică", - "average": "Medie" + "average": "Medie", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/ru/metrics.json b/generators/languages/templates/src/main/webapp/i18n/ru/metrics.json index 21d2d35cb6e4..d90d91022632 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ru/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/ru/metrics.json @@ -46,7 +46,8 @@ "code": "Код", "count": "Количество", "mean": "Среднее", - "average": "Среднее" + "average": "Среднее", + "max": "Max" }, "code": { "ok": "Ок", diff --git a/generators/languages/templates/src/main/webapp/i18n/sk/metrics.json b/generators/languages/templates/src/main/webapp/i18n/sk/metrics.json index fef57926e422..facfd0852149 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sk/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/sk/metrics.json @@ -46,7 +46,8 @@ "code": "Kód", "count": "Počet", "mean": "Priemer (Mean)", - "average": "Priemer (Average)" + "average": "Priemer (Average)", + "max": "Max" }, "code": { "ok": "OK", diff --git a/generators/languages/templates/src/main/webapp/i18n/sr/metrics.json b/generators/languages/templates/src/main/webapp/i18n/sr/metrics.json index f5d63eb70b61..b92baa86d3f9 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sr/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/sr/metrics.json @@ -46,7 +46,8 @@ "code": "Code", "count": "Broj", "mean": "Sredja Vrednost", - "average": "Prosek" + "average": "Prosek", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/sv/metrics.json b/generators/languages/templates/src/main/webapp/i18n/sv/metrics.json index f2429e72fb5b..5c5c29fef422 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sv/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/sv/metrics.json @@ -46,7 +46,8 @@ "code": "Kod", "count": "Antal", "mean": "Medelvärde", - "average": "Genomsnitt" + "average": "Genomsnitt", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/ta/metrics.json b/generators/languages/templates/src/main/webapp/i18n/ta/metrics.json index a8970ae1d0c2..e76ab8e256ad 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ta/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/ta/metrics.json @@ -46,7 +46,8 @@ "code": "கோட்", "count": "எண்ணிக்கை", "mean": "நடுவம்", - "average": "சராசரி" + "average": "சராசரி", + "max": "Max" }, "code": { "ok": "சரி", diff --git a/generators/languages/templates/src/main/webapp/i18n/th/metrics.json b/generators/languages/templates/src/main/webapp/i18n/th/metrics.json index 9d804947c571..f5bd858a988a 100644 --- a/generators/languages/templates/src/main/webapp/i18n/th/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/th/metrics.json @@ -46,7 +46,8 @@ "code": "Code", "count": "Count", "mean": "Mean", - "average": "Average" + "average": "Average", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/tr/metrics.json b/generators/languages/templates/src/main/webapp/i18n/tr/metrics.json index 8f98f98b08e4..c0e68c7d5e6f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/tr/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/tr/metrics.json @@ -46,7 +46,8 @@ "code": "Code", "count": "Count", "mean": "Mean", - "average": "Average" + "average": "Average", + "max": "Max" }, "code": { "ok": "Ok", diff --git a/generators/languages/templates/src/main/webapp/i18n/ua/metrics.json b/generators/languages/templates/src/main/webapp/i18n/ua/metrics.json index 50f1f7317d14..da0757dd7f7b 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ua/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/ua/metrics.json @@ -46,7 +46,8 @@ "code": "Код", "count": "Кількість", "mean": "Середнє", - "average": "Середнє" + "average": "Середнє", + "max": "Max" }, "code": { "ok": "Ок", diff --git a/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/metrics.json b/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/metrics.json index b0b07aa2e0c6..34aa05173dd1 100644 --- a/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/metrics.json @@ -46,7 +46,8 @@ "code": "Kod", "count": "Soni", "mean": "O'rtacha", - "average": "O'rtacha" + "average": "O'rtacha", + "max": "Max" }, "code": { "ok": "OK", diff --git a/generators/languages/templates/src/main/webapp/i18n/vi/metrics.json b/generators/languages/templates/src/main/webapp/i18n/vi/metrics.json index b7f715ae3d21..8056a49469ed 100644 --- a/generators/languages/templates/src/main/webapp/i18n/vi/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/vi/metrics.json @@ -46,7 +46,8 @@ "code": "Mã", "count": "Số lượng", "mean": "Bình quân", - "average": "Trung bình" + "average": "Trung bình", + "max": "Max" }, "code": { "ok": "Thành công", diff --git a/generators/languages/templates/src/main/webapp/i18n/zh-cn/metrics.json b/generators/languages/templates/src/main/webapp/i18n/zh-cn/metrics.json index 7900e663ca82..4d81015fb64f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/zh-cn/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/zh-cn/metrics.json @@ -46,7 +46,8 @@ "code": "状态码", "count": "次数", "mean": "平均数", - "average": "平均值" + "average": "平均值", + "max": "Max" }, "code": { "ok": "2xx (成功)", diff --git a/generators/languages/templates/src/main/webapp/i18n/zh-tw/metrics.json b/generators/languages/templates/src/main/webapp/i18n/zh-tw/metrics.json index 8c5fea4186ac..efd37de66fb9 100644 --- a/generators/languages/templates/src/main/webapp/i18n/zh-tw/metrics.json +++ b/generators/languages/templates/src/main/webapp/i18n/zh-tw/metrics.json @@ -46,7 +46,8 @@ "code": "狀態碼", "count": "計數", "mean": "平均數", - "average": "平均值" + "average": "平均值", + "max": "Max" }, "code": { "ok": "2xx (成功)", From 38d645862e46f41e9265635cb3400472ffef4581 Mon Sep 17 00:00:00 2001 From: yelhouti Date: Wed, 25 Nov 2020 10:54:51 +0100 Subject: [PATCH 0022/1179] allow ManyToOne to also use back reference (#13131) --- jdl/validators/relationship-validator.js | 8 -------- test/jdl/validators/relationship-validator.spec.js | 6 ++---- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/jdl/validators/relationship-validator.js b/jdl/validators/relationship-validator.js index 70913cf14344..823c4bbf062b 100644 --- a/jdl/validators/relationship-validator.js +++ b/jdl/validators/relationship-validator.js @@ -118,14 +118,6 @@ function checkOneToOneRelationship(jdlRelationship) { } function checkManyToOneRelationship(jdlRelationship, skippedUserManagementOption) { - const bidirectionalRelationship = jdlRelationship.injectedFieldInFrom && jdlRelationship.injectedFieldInTo; - if (bidirectionalRelationship) { - throw new Error( - `In the Many-to-One relationship from ${jdlRelationship.from} to ${jdlRelationship.to}, ` + - 'only unidirectionality is supported, you should either create a bidirectional One-to-Many relationship or ' + - 'remove the injected field in the destination entity instead.' - ); - } const unidirectionalRelationship = !jdlRelationship.injectedFieldInFrom || !jdlRelationship.injectedFieldInTo; const userIsTheSourceEntity = isUserManagementEntity(jdlRelationship.from); const userIsTheDestinationEntity = isUserManagementEntity(jdlRelationship.to); diff --git a/test/jdl/validators/relationship-validator.spec.js b/test/jdl/validators/relationship-validator.spec.js index 576866daf998..37089984fafc 100644 --- a/test/jdl/validators/relationship-validator.spec.js +++ b/test/jdl/validators/relationship-validator.spec.js @@ -182,10 +182,8 @@ describe('RelationshipValidator', () => { }); }); - it('should fail', () => { - expect(() => validator.validate(relationship)).to.throw( - /^In the Many-to-One relationship from A to B, only unidirectionality is supported, you should either create a bidirectional One-to-Many relationship or remove the injected field in the destination entity instead\.$/ - ); + it('should not fail', () => { + expect(() => validator.validate(relationship)).not.to.throw(); }); }); }); From 9afa781b8f36ec6736f81ff2bf14de4a286ce809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Tamisier?= Date: Tue, 24 Nov 2020 16:34:44 +0100 Subject: [PATCH 0023/1179] Revert "[react] Fix default values in entity form" This reverts commit 27f6c01e3c9a50008e8ead561d52b219b2b0cd55. --- .../main/webapp/app/entities/entity-update.tsx.ejs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs index abd01d89197e..0881da6eb464 100644 --- a/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs +++ b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs @@ -206,17 +206,10 @@ export const <%= entityReactName %>Update = (props: I<%= entityReactName %>Updat <%_ }) _%> <%_ } _%> - const cloneEntity = Object.assign({}, entity); - for (const property in entity) { - if (entity[property] === '') { - cloneEntity[property] = null; - } - } - if (isNew) { - props.createEntity(cloneEntity); + props.createEntity(entity); } else { - props.updateEntity(cloneEntity); + props.updateEntity(entity); } } } From 738b8ef653ad549e667f4b072278f8fd65bbca15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Tamisier?= Date: Thu, 26 Nov 2020 17:42:07 +0100 Subject: [PATCH 0024/1179] refactor: rename pagination questions --- generators/entity/prompts.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generators/entity/prompts.js b/generators/entity/prompts.js index d5bfadad3098..28afe096a568 100644 --- a/generators/entity/prompts.js +++ b/generators/entity/prompts.js @@ -411,7 +411,7 @@ function askForPagination() { { type: 'list', name: 'pagination', - message: 'Do you want pagination on your entity?', + message: 'Do you want pagination and sorting on your entity?', choices: [ { value: 'no', @@ -419,11 +419,11 @@ function askForPagination() { }, { value: 'pagination', - name: 'Yes, with pagination links', + name: 'Yes, with pagination links and sorting headers', }, { value: 'infinite-scroll', - name: 'Yes, with infinite scroll', + name: 'Yes, with infinite scroll and sorting headers', }, ], default: 0, From 20a41446ea4ea8b2ab9d4c505df71e71db7d2f6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Nov 2020 06:23:35 +0000 Subject: [PATCH 0025/1179] chore(deps): bump swagger-ui-dist Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 3.37.0 to 3.37.2. - [Release notes](https://github.com/swagger-api/swagger-ui/releases) - [Commits](https://github.com/swagger-api/swagger-ui/compare/v3.37.0...v3.37.2) Signed-off-by: dependabot[bot] --- generators/client/templates/angular/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/templates/angular/package.json b/generators/client/templates/angular/package.json index 6f2d87dbbc3d..b6de51df52b3 100644 --- a/generators/client/templates/angular/package.json +++ b/generators/client/templates/angular/package.json @@ -12,7 +12,7 @@ "ngx-infinite-scroll": "10.0.0", "ngx-webstorage": "6.0.0", "rxjs": "6.6.3", - "swagger-ui-dist": "3.37.0", + "swagger-ui-dist": "3.37.2", "tslib": "2.0.3", "zone.js": "0.10.3" }, From 328a633a6f976ea87e54ed79a24d85d5d628b463 Mon Sep 17 00:00:00 2001 From: qmonmert Date: Sat, 28 Nov 2020 21:41:13 +0100 Subject: [PATCH 0026/1179] [react] Fix: No space between words --- .../react/src/main/webapp/app/modules/home/home.tsx.ejs | 1 + 1 file changed, 1 insertion(+) diff --git a/generators/client/templates/react/src/main/webapp/app/modules/home/home.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/home/home.tsx.ejs index 05f46198360d..667f5d4ca6e2 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/home/home.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/home/home.tsx.ejs @@ -62,6 +62,7 @@ export const Home = (props: IHomeProp) => {
If you want to + <% if (!enableTranslation) { %> <% } %> <%_ if (authenticationType === 'oauth2') { _%> sign in From abc5749b1a238f6b3089ea232c69fb0cef13366a Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Sun, 29 Nov 2020 04:28:20 +0200 Subject: [PATCH 0027/1179] Fix missing catch block of Promise by replacing Promise with Observable --- .../app/admin/user-management/user-management.component.ts.ejs | 3 ++- .../webapp/app/entities/entity-management.component.ts.ejs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs index 0224c753ca05..854b784cee56 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs @@ -79,7 +79,8 @@ export class UserManagementComponent implements OnInit { deleteUser(user: User): void { const modalRef = this.modalService.open(UserManagementDeleteDialogComponent, { size: 'lg', backdrop: 'static' }); modalRef.componentInstance.user = user; - modalRef.result.then(reason => { + // unsubscribe not needed because closed completes on modal close + modalRef.closed.subscribe(reason => { if (reason === 'deleted') { this.loadAll(); } diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.component.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.component.ts.ejs index a6bf947486af..37da522c0e06 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.component.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.component.ts.ejs @@ -83,7 +83,8 @@ export class <%= entityAngularName %>Component implements OnInit { delete(<%= entityInstance %>: I<%= entityAngularName %>): void { const modalRef = this.modalService.open(<%= entityAngularName %>DeleteDialogComponent, { size: 'lg', backdrop: 'static' }); modalRef.componentInstance.<%= entityInstance %> = <%= entityInstance %>; - modalRef.result.then(reason => { + // unsubscribe not needed because closed completes on modal close + modalRef.closed.subscribe(reason => { if (reason === 'deleted') { <%= eventCallBack %>; } From 65b0dc0696d213c97e19893772491fa186cc8d6a Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Sun, 29 Nov 2020 04:55:12 +0200 Subject: [PATCH 0028/1179] Move metrics blocks into subfolder blocks for better readability --- generators/cleanup.js | 9 ++++ generators/client/files-angular.js | 44 +++++++++++-------- .../jvm-memory/jvm-memory.component.html.ejs | 0 .../jvm-memory/jvm-memory.component.ts.ejs | 2 +- .../jvm-threads.component.html.ejs | 0 .../jvm-threads/jvm-threads.component.ts.ejs | 2 +- .../metrics-cache.component.html.ejs | 0 .../metrics-cache.component.ts.ejs | 2 +- .../metrics-datasource.component.html.ejs | 0 .../metrics-datasource.component.ts.ejs | 2 +- ...rics-endpoints-requests.component.html.ejs | 0 ...etrics-endpoints-requests.component.ts.ejs | 2 +- ...etrics-garbagecollector.component.html.ejs | 0 .../metrics-garbagecollector.component.ts.ejs | 2 +- .../metrics-modal-threads.component.html.ejs | 0 .../metrics-modal-threads.component.ts.ejs | 2 +- .../metrics-request.component.html.ejs | 0 .../metrics-request.component.ts.ejs | 2 +- .../metrics-system.component.html.ejs | 0 .../metrics-system.component.ts.ejs | 2 +- .../app/admin/metrics/metrics.module.ts.ejs | 18 ++++---- test/utils/expected-files.js | 36 +++++++-------- 22 files changed, 71 insertions(+), 54 deletions(-) rename generators/client/templates/angular/src/main/webapp/app/admin/metrics/{ => blocks}/jvm-memory/jvm-memory.component.html.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/admin/metrics/{ => blocks}/jvm-memory/jvm-memory.component.ts.ejs (94%) rename generators/client/templates/angular/src/main/webapp/app/admin/metrics/{ => blocks}/jvm-threads/jvm-threads.component.html.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/admin/metrics/{ => blocks}/jvm-threads/jvm-threads.component.ts.ejs (97%) rename generators/client/templates/angular/src/main/webapp/app/admin/metrics/{ => blocks}/metrics-cache/metrics-cache.component.html.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/admin/metrics/{ => blocks}/metrics-cache/metrics-cache.component.ts.ejs (95%) rename generators/client/templates/angular/src/main/webapp/app/admin/metrics/{ => blocks}/metrics-datasource/metrics-datasource.component.html.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/admin/metrics/{ => blocks}/metrics-datasource/metrics-datasource.component.ts.ejs (95%) rename generators/client/templates/angular/src/main/webapp/app/admin/metrics/{ => blocks}/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/admin/metrics/{ => blocks}/metrics-endpoints-requests/metrics-endpoints-requests.component.ts.ejs (95%) rename generators/client/templates/angular/src/main/webapp/app/admin/metrics/{ => blocks}/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/admin/metrics/{ => blocks}/metrics-garbagecollector/metrics-garbagecollector.component.ts.ejs (94%) rename generators/client/templates/angular/src/main/webapp/app/admin/metrics/{ => blocks}/metrics-modal-threads/metrics-modal-threads.component.html.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/admin/metrics/{ => blocks}/metrics-modal-threads/metrics-modal-threads.component.ts.ejs (97%) rename generators/client/templates/angular/src/main/webapp/app/admin/metrics/{ => blocks}/metrics-request/metrics-request.component.html.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/admin/metrics/{ => blocks}/metrics-request/metrics-request.component.ts.ejs (94%) rename generators/client/templates/angular/src/main/webapp/app/admin/metrics/{ => blocks}/metrics-system/metrics-system.component.html.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/admin/metrics/{ => blocks}/metrics-system/metrics-system.component.ts.ejs (96%) diff --git a/generators/cleanup.js b/generators/cleanup.js index 01c5cb18458a..e830b79834ff 100644 --- a/generators/cleanup.js +++ b/generators/cleanup.js @@ -157,6 +157,15 @@ function cleanupOldFiles(generator) { generator.removeFile(`${ANGULAR_DIR}shared/duration.pipe.ts`); generator.removeFolder(`${ANGULAR_DIR}core/event-manager`); generator.removeFolder(`${CLIENT_TEST_SRC_DIR}spec/app/core/event-manager`); + generator.removeFolder(`${ANGULAR_DIR}admin/metrics/jvm-memory`); + generator.removeFolder(`${ANGULAR_DIR}admin/metrics/jvm-threads`); + generator.removeFolder(`${ANGULAR_DIR}admin/metrics/metrics-cache`); + generator.removeFolder(`${ANGULAR_DIR}admin/metrics/metrics-datasource`); + generator.removeFolder(`${ANGULAR_DIR}admin/metrics/metrics-endpoints-requests`); + generator.removeFolder(`${ANGULAR_DIR}admin/metrics/metrics-garbagecollector`); + generator.removeFolder(`${ANGULAR_DIR}admin/metrics/metrics-modal-threads`); + generator.removeFolder(`${ANGULAR_DIR}admin/metrics/metrics-request`); + generator.removeFolder(`${ANGULAR_DIR}admin/metrics/metrics-system`); } else if (generator.jhipsterConfig.clientFramework === REACT) { generator.removeFile(`${REACT_DIR}modules/administration/audits/audits.tsx`); generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/enzyme-setup.ts`); diff --git a/generators/client/files-angular.js b/generators/client/files-angular.js index 184fe03be27d..149a33ec5418 100644 --- a/generators/client/files-angular.js +++ b/generators/client/files-angular.js @@ -227,32 +227,40 @@ const files = { { file: 'admin/metrics/metrics.component.html', method: 'processHtml', template: true }, 'admin/metrics/metrics.service.ts', 'admin/metrics/metrics.model.ts', - 'admin/metrics/jvm-memory/jvm-memory.component.ts', - { file: 'admin/metrics/jvm-memory/jvm-memory.component.html', method: 'processHtml', template: true }, - 'admin/metrics/jvm-threads/jvm-threads.component.ts', - { file: 'admin/metrics/jvm-threads/jvm-threads.component.html', method: 'processHtml', template: true }, - 'admin/metrics/metrics-cache/metrics-cache.component.ts', - { file: 'admin/metrics/metrics-cache/metrics-cache.component.html', method: 'processHtml', template: true }, - 'admin/metrics/metrics-datasource/metrics-datasource.component.ts', - { file: 'admin/metrics/metrics-datasource/metrics-datasource.component.html', method: 'processHtml', template: true }, - 'admin/metrics/metrics-endpoints-requests/metrics-endpoints-requests.component.ts', + 'admin/metrics/blocks/jvm-memory/jvm-memory.component.ts', + { file: 'admin/metrics/blocks/jvm-memory/jvm-memory.component.html', method: 'processHtml', template: true }, + 'admin/metrics/blocks/jvm-threads/jvm-threads.component.ts', + { file: 'admin/metrics/blocks/jvm-threads/jvm-threads.component.html', method: 'processHtml', template: true }, + 'admin/metrics/blocks/metrics-cache/metrics-cache.component.ts', + { file: 'admin/metrics/blocks/metrics-cache/metrics-cache.component.html', method: 'processHtml', template: true }, + 'admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts', { - file: 'admin/metrics/metrics-endpoints-requests/metrics-endpoints-requests.component.html', + file: 'admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html', method: 'processHtml', template: true, }, - 'admin/metrics/metrics-garbagecollector/metrics-garbagecollector.component.ts', + 'admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts', { - file: 'admin/metrics/metrics-garbagecollector/metrics-garbagecollector.component.html', + file: 'admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html', method: 'processHtml', template: true, }, - 'admin/metrics/metrics-modal-threads/metrics-modal-threads.component.ts', - { file: 'admin/metrics/metrics-modal-threads/metrics-modal-threads.component.html', method: 'processHtml', template: true }, - 'admin/metrics/metrics-request/metrics-request.component.ts', - { file: 'admin/metrics/metrics-request/metrics-request.component.html', method: 'processHtml', template: true }, - 'admin/metrics/metrics-system/metrics-system.component.ts', - { file: 'admin/metrics/metrics-system/metrics-system.component.html', method: 'processHtml', template: true }, + 'admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts', + { + file: 'admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html', + method: 'processHtml', + template: true, + }, + 'admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts', + { + file: 'admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html', + method: 'processHtml', + template: true, + }, + 'admin/metrics/blocks/metrics-request/metrics-request.component.ts', + { file: 'admin/metrics/blocks/metrics-request/metrics-request.component.html', method: 'processHtml', template: true }, + 'admin/metrics/blocks/metrics-system/metrics-system.component.ts', + { file: 'admin/metrics/blocks/metrics-system/metrics-system.component.html', method: 'processHtml', template: true }, ], }, { diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/jvm-memory/jvm-memory.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/admin/metrics/jvm-memory/jvm-memory.component.html.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/jvm-memory/jvm-memory.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts.ejs similarity index 94% rename from generators/client/templates/angular/src/main/webapp/app/admin/metrics/jvm-memory/jvm-memory.component.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts.ejs index 98ecdea0105c..d3610d1af297 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/jvm-memory/jvm-memory.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts.ejs @@ -18,7 +18,7 @@ -%> import { Component, Input } from '@angular/core'; -import { JvmMetrics } from '../metrics.model'; +import { JvmMetrics } from 'app/admin/metrics/metrics.model'; @Component({ selector: '<%= jhiPrefixDashed %>-jvm-memory', diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/jvm-threads/jvm-threads.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.html.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/admin/metrics/jvm-threads/jvm-threads.component.html.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.html.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/jvm-threads/jvm-threads.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.ts.ejs similarity index 97% rename from generators/client/templates/angular/src/main/webapp/app/admin/metrics/jvm-threads/jvm-threads.component.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.ts.ejs index d018cce2603b..8c03f830a29f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/jvm-threads/jvm-threads.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.ts.ejs @@ -19,7 +19,7 @@ import { Component, Input } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { Thread } from '../metrics.model'; +import { Thread } from 'app/admin/metrics/metrics.model'; import { MetricsModalThreadsComponent } from '../metrics-modal-threads/metrics-modal-threads.component'; @Component({ diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-cache/metrics-cache.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-cache/metrics-cache.component.html.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-cache/metrics-cache.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.ejs similarity index 95% rename from generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-cache/metrics-cache.component.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.ejs index b48186af6c8d..76230b0879f8 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-cache/metrics-cache.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.ejs @@ -18,7 +18,7 @@ -%> import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; -import { CacheMetrics } from '../metrics.model'; +import { CacheMetrics } from 'app/admin/metrics/metrics.model'; @Component({ selector: '<%= jhiPrefixDashed %>-metrics-cache', diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-datasource/metrics-datasource.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-datasource/metrics-datasource.component.html.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-datasource/metrics-datasource.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts.ejs similarity index 95% rename from generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-datasource/metrics-datasource.component.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts.ejs index c347946530af..a9070ddc8c27 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-datasource/metrics-datasource.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts.ejs @@ -18,7 +18,7 @@ -%> import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; -import { Databases } from '../metrics.model'; +import { Databases } from 'app/admin/metrics/metrics.model'; @Component({ selector: '<%= jhiPrefixDashed %>-metrics-datasource', diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-endpoints-requests/metrics-endpoints-requests.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts.ejs similarity index 95% rename from generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-endpoints-requests/metrics-endpoints-requests.component.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts.ejs index e4bed92e2258..038c79698315 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-endpoints-requests/metrics-endpoints-requests.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts.ejs @@ -18,7 +18,7 @@ -%> import { Component, Input } from '@angular/core'; -import { Services } from '../metrics.model'; +import { Services } from 'app/admin/metrics/metrics.model'; @Component({ selector: '<%= jhiPrefixDashed %>-metrics-endpoints-requests', diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-garbagecollector/metrics-garbagecollector.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts.ejs similarity index 94% rename from generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-garbagecollector/metrics-garbagecollector.component.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts.ejs index 1a837b759241..0f4151c5e58e 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-garbagecollector/metrics-garbagecollector.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts.ejs @@ -18,7 +18,7 @@ -%> import { Component, Input } from '@angular/core'; -import { GarbageCollector } from '../metrics.model'; +import { GarbageCollector } from 'app/admin/metrics/metrics.model'; @Component({ selector: '<%= jhiPrefixDashed %>-metrics-garbagecollector', diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-modal-threads/metrics-modal-threads.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-modal-threads/metrics-modal-threads.component.html.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-modal-threads/metrics-modal-threads.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts.ejs similarity index 97% rename from generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-modal-threads/metrics-modal-threads.component.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts.ejs index 116c55a497dd..b2a93b757f2a 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-modal-threads/metrics-modal-threads.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts.ejs @@ -19,7 +19,7 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { Thread, ThreadState } from '../metrics.model'; +import { Thread, ThreadState } from 'app/admin/metrics/metrics.model'; @Component({ selector: '<%= jhiPrefixDashed %>-thread-modal', diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-request/metrics-request.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-request/metrics-request.component.html.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-request/metrics-request.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts.ejs similarity index 94% rename from generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-request/metrics-request.component.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts.ejs index aee08bacbde8..857e767d41ef 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-request/metrics-request.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts.ejs @@ -18,7 +18,7 @@ -%> import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; -import { HttpServerRequests } from '../metrics.model'; +import { HttpServerRequests } from 'app/admin/metrics/metrics.model'; @Component({ selector: '<%= jhiPrefixDashed %>-metrics-request', diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-system/metrics-system.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-system/metrics-system.component.html.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-system/metrics-system.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.ts.ejs similarity index 96% rename from generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-system/metrics-system.component.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.ts.ejs index 278a7007756e..149fe969233f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics-system/metrics-system.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.ts.ejs @@ -18,7 +18,7 @@ -%> import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; -import { ProcessMetrics } from '../metrics.model'; +import { ProcessMetrics } from 'app/admin/metrics/metrics.model'; @Component({ selector: '<%= jhiPrefixDashed %>-metrics-system', diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.module.ts.ejs index db0c9b76515b..4ea0142a2b5e 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.module.ts.ejs @@ -22,15 +22,15 @@ import { RouterModule } from '@angular/router'; import { SharedModule } from 'app/shared/shared.module'; import { MetricsComponent } from './metrics.component'; import { metricsRoute } from './metrics.route'; -import { JvmMemoryComponent } from './jvm-memory/jvm-memory.component'; -import { JvmThreadsComponent } from './jvm-threads/jvm-threads.component'; -import { MetricsCacheComponent } from './metrics-cache/metrics-cache.component'; -import { MetricsDatasourceComponent } from './metrics-datasource/metrics-datasource.component'; -import { MetricsEndpointsRequestsComponent } from './metrics-endpoints-requests/metrics-endpoints-requests.component'; -import { MetricsGarbageCollectorComponent } from './metrics-garbagecollector/metrics-garbagecollector.component'; -import { MetricsModalThreadsComponent } from './metrics-modal-threads/metrics-modal-threads.component'; -import { MetricsRequestComponent } from './metrics-request/metrics-request.component'; -import { MetricsSystemComponent } from './metrics-system/metrics-system.component'; +import { JvmMemoryComponent } from './blocks/jvm-memory/jvm-memory.component'; +import { JvmThreadsComponent } from './blocks/jvm-threads/jvm-threads.component'; +import { MetricsCacheComponent } from './blocks/metrics-cache/metrics-cache.component'; +import { MetricsDatasourceComponent } from './blocks/metrics-datasource/metrics-datasource.component'; +import { MetricsEndpointsRequestsComponent } from './blocks/metrics-endpoints-requests/metrics-endpoints-requests.component'; +import { MetricsGarbageCollectorComponent } from './blocks/metrics-garbagecollector/metrics-garbagecollector.component'; +import { MetricsModalThreadsComponent } from './blocks/metrics-modal-threads/metrics-modal-threads.component'; +import { MetricsRequestComponent } from './blocks/metrics-request/metrics-request.component'; +import { MetricsSystemComponent } from './blocks/metrics-system/metrics-system.component'; @NgModule({ imports: [SharedModule, RouterModule.forChild([metricsRoute])], diff --git a/test/utils/expected-files.js b/test/utils/expected-files.js index 26efb8655eb2..43649481dcfd 100644 --- a/test/utils/expected-files.js +++ b/test/utils/expected-files.js @@ -547,24 +547,24 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/admin/logs/logs.route.ts`, `${CLIENT_MAIN_SRC_DIR}app/admin/logs/logs.module.ts`, `${CLIENT_MAIN_SRC_DIR}app/admin/logs/logs.service.ts`, - `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/jvm-memory/jvm-memory.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/jvm-memory/jvm-memory.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/jvm-threads/jvm-threads.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/jvm-threads/jvm-threads.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics-cache/metrics-cache.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics-cache/metrics-cache.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics-datasource/metrics-datasource.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics-datasource/metrics-datasource.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics-endpoints-requests/metrics-endpoints-requests.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics-endpoints-requests/metrics-endpoints-requests.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics-garbagecollector/metrics-garbagecollector.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics-garbagecollector/metrics-garbagecollector.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics-modal-threads/metrics-modal-threads.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics-modal-threads/metrics-modal-threads.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics-request/metrics-request.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics-request/metrics-request.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics-system/metrics-system.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics-system/metrics-system.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/blocks/jvm-threads/jvm-threads.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/blocks/jvm-threads/jvm-threads.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/blocks/metrics-request/metrics-request.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/blocks/metrics-request/metrics-request.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/blocks/metrics-system/metrics-system.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/blocks/metrics-system/metrics-system.component.html`, `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics.component.html`, `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics.route.ts`, From 069b3b18d1fae40018ea929591dc6f12d6dfe9ca Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Sun, 29 Nov 2020 05:04:31 +0200 Subject: [PATCH 0029/1179] Add missing license headers --- .../app/shared/date/duration.pipe.ts.ejs | 18 ++++++++++++++++++ .../shared/date/format-medium-date.pipe.ts.ejs | 18 ++++++++++++++++++ .../date/format-medium-datetime.pipe.ts.ejs | 18 ++++++++++++++++++ .../date/format-medium-date.pipe.spec.ts.ejs | 18 ++++++++++++++++++ .../format-medium-datetime.pipe.spec.ts.ejs | 18 ++++++++++++++++++ 5 files changed, 90 insertions(+) diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/date/duration.pipe.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/date/duration.pipe.ts.ejs index 791b30b44486..f4cd734c6001 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/date/duration.pipe.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/date/duration.pipe.ts.ejs @@ -1,3 +1,21 @@ +<%# + Copyright 2013-2020 the original author or authors from the JHipster project. + + 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"); + 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 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-%> import { Pipe, PipeTransform } from '@angular/core'; import * as dayjs from 'dayjs'; diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.ts.ejs index fe3238930a56..bceb4da171b5 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.ts.ejs @@ -1,3 +1,21 @@ +<%# + Copyright 2013-2020 the original author or authors from the JHipster project. + + 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"); + 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 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-%> import { Pipe, PipeTransform } from '@angular/core'; import * as dayjs from 'dayjs'; diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.ts.ejs index 5c2d3dd36ad1..f3192a188e9d 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.ts.ejs @@ -1,3 +1,21 @@ +<%# + Copyright 2013-2020 the original author or authors from the JHipster project. + + 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"); + 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 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-%> import { Pipe, PipeTransform } from '@angular/core'; import * as dayjs from 'dayjs'; diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/shared/date/format-medium-date.pipe.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/shared/date/format-medium-date.pipe.spec.ts.ejs index dbe276b8f74e..34b05ff917fc 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/shared/date/format-medium-date.pipe.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/shared/date/format-medium-date.pipe.spec.ts.ejs @@ -1,3 +1,21 @@ +<%# + Copyright 2013-2020 the original author or authors from the JHipster project. + + 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"); + 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 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-%> import * as dayjs from 'dayjs'; import { FormatMediumDatePipe } from 'app/shared/date/format-medium-date.pipe'; diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/shared/date/format-medium-datetime.pipe.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/shared/date/format-medium-datetime.pipe.spec.ts.ejs index cfbc1223e269..8aa1663ee82a 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/shared/date/format-medium-datetime.pipe.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/shared/date/format-medium-datetime.pipe.spec.ts.ejs @@ -1,3 +1,21 @@ +<%# + Copyright 2013-2020 the original author or authors from the JHipster project. + + 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"); + 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 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-%> import * as dayjs from 'dayjs'; import { FormatMediumDatetimePipe } from 'app/shared/date/format-medium-datetime.pipe'; From 927bc99fd0e53e979e4ac94f8de2c868bb5b2174 Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Sun, 29 Nov 2020 05:08:11 +0200 Subject: [PATCH 0030/1179] [angular] Polish imports --- .../javascript/spec/app/shared/translate.directive.spec.ts.ejs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/shared/translate.directive.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/shared/translate.directive.spec.ts.ejs index 344bacdbce46..17cacfd78cc8 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/shared/translate.directive.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/shared/translate.directive.spec.ts.ejs @@ -16,10 +16,11 @@ See the License for the specific language governing permissions and limitations under the License. -%> +import { Component } from '@angular/core'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; + import { TranslateDirective } from 'app/shared/translate.directive'; -import { Component } from '@angular/core'; @Component({ template: `
Translate="test">
`, From 60fce127648e9c5de2fb7b1df5bb2582f55fa3db Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Sun, 29 Nov 2020 05:51:06 +0200 Subject: [PATCH 0031/1179] [angular] Revert "[angular] Move authority enum under user folder and use this in models" This reverts commit a17093d490539c8916805a4cdf540d862885433f. --- generators/cleanup.js | 1 + generators/client/files-angular.js | 2 +- .../main/webapp/app/account/password/password.route.ts.ejs | 2 +- .../main/webapp/app/account/sessions/sessions.route.ts.ejs | 2 +- .../main/webapp/app/account/settings/settings.route.ts.ejs | 2 +- .../angular/src/main/webapp/app/app-routing.module.ts.ejs | 2 +- .../authority.constants.ts.ejs} | 0 .../src/main/webapp/app/core/user/account.model.ts.ejs | 4 +--- .../angular/src/main/webapp/app/core/user/user.model.ts.ejs | 6 ++---- .../src/main/webapp/app/core/user/user.service.ts.ejs | 2 +- .../user-management-detail.component.spec.ts.ejs | 2 +- .../user-management-update.component.spec.ts.ejs | 2 +- .../spec/app/core/user/account.service.spec.ts.ejs | 4 ++-- .../javascript/spec/app/core/user/user.service.spec.ts.ejs | 2 +- .../app/entities/entity-management-routing.module.ts.ejs | 2 +- test/utils/expected-files.js | 2 +- 16 files changed, 17 insertions(+), 20 deletions(-) rename generators/client/templates/angular/src/main/webapp/app/core/{user/authority.model.ts.ejs => config/authority.constants.ts.ejs} (100%) diff --git a/generators/cleanup.js b/generators/cleanup.js index 01c5cb18458a..a9c5960c822b 100644 --- a/generators/cleanup.js +++ b/generators/cleanup.js @@ -155,6 +155,7 @@ function cleanupOldFiles(generator) { // unreleased files and folders cleanup for v7 developers generator.removeFile(`${ANGULAR_DIR}config/dayjs.ts`); generator.removeFile(`${ANGULAR_DIR}shared/duration.pipe.ts`); + generator.removeFile(`${ANGULAR_DIR}core/user/authority.model.ts`); generator.removeFolder(`${ANGULAR_DIR}core/event-manager`); generator.removeFolder(`${CLIENT_TEST_SRC_DIR}spec/app/core/event-manager`); } else if (generator.jhipsterConfig.clientFramework === REACT) { diff --git a/generators/client/files-angular.js b/generators/client/files-angular.js index 184fe03be27d..ccfa0014ea43 100644 --- a/generators/client/files-angular.js +++ b/generators/client/files-angular.js @@ -301,7 +301,6 @@ const files = { path: ANGULAR_DIR, templates: [ 'core/user/account.model.ts', - 'core/user/authority.model.ts', 'core/util/data-util.service.ts', 'core/util/parse-links.service.ts', 'core/util/alert.service.ts', @@ -315,6 +314,7 @@ const files = { 'core/config/error.constants.ts', 'core/config/input.constants.ts', 'core/config/pagination.constants.ts', + 'core/config/authority.constants.ts', // interceptors 'core/interceptor/error-handler.interceptor.ts', diff --git a/generators/client/templates/angular/src/main/webapp/app/account/password/password.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password.route.ts.ejs index 3dd03aceff43..64ea4023df67 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password/password.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password/password.route.ts.ejs @@ -20,7 +20,7 @@ import { Route } from '@angular/router'; import { UserRouteAccessService } from 'app/core/auth/user-route-access.service'; import { PasswordComponent } from './password.component'; -import { Authority } from 'app/core/user/authority.model'; +import { Authority } from 'app/core/config/authority.constants'; export const passwordRoute: Route = { path: 'password', diff --git a/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.route.ts.ejs index 919b07cb605a..5e3f2b195925 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.route.ts.ejs @@ -18,7 +18,7 @@ -%> import { Route } from '@angular/router'; -import { Authority } from 'app/core/user/authority.model'; +import { Authority } from 'app/core/config/authority.constants'; import { UserRouteAccessService } from 'app/core/auth/user-route-access.service'; import { SessionsComponent } from './sessions.component'; diff --git a/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.route.ts.ejs index deb3ee1c4a75..1f476198cfbc 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.route.ts.ejs @@ -20,7 +20,7 @@ import { Route } from '@angular/router'; import { UserRouteAccessService } from 'app/core/auth/user-route-access.service'; import { SettingsComponent } from './settings.component'; -import { Authority } from 'app/core/user/authority.model'; +import { Authority } from 'app/core/config/authority.constants'; export const settingsRoute: Route = { path: 'settings', diff --git a/generators/client/templates/angular/src/main/webapp/app/app-routing.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/app-routing.module.ts.ejs index 458d717bd444..5ebde6605cc6 100644 --- a/generators/client/templates/angular/src/main/webapp/app/app-routing.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/app-routing.module.ts.ejs @@ -21,7 +21,7 @@ import { RouterModule } from '@angular/router'; import { errorRoute } from './layouts/error/error.route'; import { navbarRoute } from './layouts/navbar/navbar.route'; import { DEBUG_INFO_ENABLED } from 'app/app.constants'; -import { Authority } from 'app/core/user/authority.model'; +import { Authority } from 'app/core/config/authority.constants'; import { UserRouteAccessService } from 'app/core/auth/user-route-access.service'; diff --git a/generators/client/templates/angular/src/main/webapp/app/core/user/authority.model.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/config/authority.constants.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/core/user/authority.model.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/core/config/authority.constants.ts.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/core/user/account.model.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/user/account.model.ts.ejs index 41ccc2a216d4..104d55f9c1c1 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/user/account.model.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/user/account.model.ts.ejs @@ -16,12 +16,10 @@ See the License for the specific language governing permissions and limitations under the License. -%> -import { Authority } from './authority.model'; - export class Account { constructor( public activated: boolean, - public authorities: Authority[], + public authorities: string[], public email: string, public firstName: string, public langKey: string, diff --git a/generators/client/templates/angular/src/main/webapp/app/core/user/user.model.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/user/user.model.ts.ejs index c5056fdc15f6..ced6201094d3 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/user/user.model.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/user/user.model.ts.ejs @@ -19,8 +19,6 @@ <%_ const idType = getTypescriptKeyType(user.primaryKeyType); _%> -import { Authority } from './authority.model'; - export interface IUser { id?: <%= idType %>; login?: string; @@ -29,7 +27,7 @@ export interface IUser { email?: string; activated?: boolean; langKey?: string; - authorities?: Authority[]; + authorities?: string[]; createdBy?: string; createdDate?: Date; lastModifiedBy?: string; @@ -46,7 +44,7 @@ export class User implements IUser { public email?: string, public activated?: boolean, public langKey?: string, - public authorities?: Authority[], + public authorities?: string[], public createdBy?: string, public createdDate?: Date, public lastModifiedBy?: string, diff --git a/generators/client/templates/angular/src/main/webapp/app/core/user/user.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/user/user.service.ts.ejs index b5137df2bb70..7ecff52a3d30 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/user/user.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/user/user.service.ts.ejs @@ -25,7 +25,7 @@ import { createRequestOption } from 'app/core/request/request-util'; import { Pagination } from 'app/core/request/request.model'; import { IUser } from './user.model'; <%_ if (authenticationType !== 'oauth2' && databaseType !== 'sql' && databaseType !== 'mongodb' && databaseType !== 'couchbase') { _%> -import { Authority } from 'app/core/user/authority.model'; +import { Authority } from 'app/core/config/authority.constants'; <%_ } _%> @Injectable({ providedIn: 'root' }) diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts.ejs index c8f129b5d629..d11c4dc427a0 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts.ejs @@ -23,7 +23,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; -import { Authority } from 'app/core/user/authority.model'; +import { Authority } from 'app/core/config/authority.constants'; import { UserManagementDetailComponent } from 'app/admin/user-management/user-management-detail.component'; import { User } from 'app/core/user/user.model'; diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts.ejs index 9701a5a5ade0..67dfdd0cc110 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts.ejs @@ -26,7 +26,7 @@ import { FormBuilder } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; -import { Authority } from 'app/core/user/authority.model'; +import { Authority } from 'app/core/config/authority.constants'; import { UserManagementUpdateComponent } from 'app/admin/user-management/user-management-update.component'; import { UserService } from 'app/core/user/user.service'; import { User } from 'app/core/user/user.model'; diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/core/user/account.service.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/core/user/account.service.spec.ts.ejs index 64045036c3f6..c546ed466e6a 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/core/user/account.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/core/user/account.service.spec.ts.ejs @@ -36,13 +36,13 @@ import { NgxWebstorageModule } from 'ngx-webstorage'; import { SERVER_API_URL } from 'app/app.constants'; import { AccountService } from 'app/core/auth/account.service'; import { Account } from 'app/core/user/account.model'; -import { Authority } from 'app/core/user/authority.model'; +import { Authority } from 'app/core/config/authority.constants'; import { StateStorageService } from 'app/core/auth/state-storage.service'; <%_ if (websocket === 'spring-websocket') { _%> import { TrackerService } from 'app/core/tracker/tracker.service'; <%_ } _%> -function accountWithAuthorities(authorities: Authority[]): Account { +function accountWithAuthorities(authorities: string[]): Account { return { activated: true, authorities, diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/core/user/user.service.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/core/user/user.service.spec.ts.ejs index d62106f81830..b29747d41064 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/core/user/user.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/core/user/user.service.spec.ts.ejs @@ -24,7 +24,7 @@ import { HttpErrorResponse } from '@angular/common/http'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; <%_ if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'couchbase') { _%> -import { Authority } from 'app/core/user/authority.model'; +import { Authority } from 'app/core/config/authority.constants'; <%_ } _%> import { UserService } from 'app/core/user/user.service'; import { User } from 'app/core/user/user.model'; diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs index 49ba830cafe9..157bd39ea933 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs @@ -20,7 +20,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { Authority } from 'app/core/user/authority.model'; +import { Authority } from 'app/core/config/authority.constants'; import { UserRouteAccessService } from 'app/core/auth/user-route-access.service'; import { <%= entityAngularName %>Component } from './<%= entityFileName %>.component'; import { <%= entityAngularName %>DetailComponent } from './<%= entityFileName %>-detail.component'; diff --git a/test/utils/expected-files.js b/test/utils/expected-files.js index 26efb8655eb2..7c162c56a754 100644 --- a/test/utils/expected-files.js +++ b/test/utils/expected-files.js @@ -441,7 +441,7 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/shared/has-any-authority.directive.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/auth/state-storage.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/auth/user-route-access.service.ts`, - `${CLIENT_MAIN_SRC_DIR}app/core/user/authority.model.ts`, + `${CLIENT_MAIN_SRC_DIR}app/core/config/authority.constants.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/config/error.constants.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/config/input.constants.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/config/pagination.constants.ts`, From 759bf861bfedc14309f9a500481d80f354cc571c Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Sun, 29 Nov 2020 06:41:23 +0200 Subject: [PATCH 0032/1179] [angular] Move config from core to root --- generators/cleanup.js | 2 +- generators/client/files-angular.js | 18 ++++++------- .../needle-api/needle-client-angular.js | 2 +- .../account/password/password.route.ts.ejs | 2 +- .../register/register.component.ts.ejs | 2 +- .../account/sessions/sessions.route.ts.ejs | 2 +- .../settings/settings.component.ts.ejs | 2 +- .../account/settings/settings.route.ts.ejs | 2 +- .../user-management-update.component.ts.ejs | 2 +- .../user-management.component.ts.ejs | 2 +- .../main/webapp/app/app-routing.module.ts.ejs | 2 +- .../src/main/webapp/app/app.module.ts.ejs | 8 +++--- .../config/authority.constants.ts.ejs | 0 .../config/datepicker-adapter.ts.ejs | 0 .../webapp/app/{core => }/config/dayjs.ts.ejs | 0 .../{core => }/config/error.constants.ts.ejs | 0 .../config/font-awesome-icons.ts.ejs | 0 .../{core => }/config/input.constants.ts.ejs | 0 .../config/language.constants.ts.ejs | 0 .../config/pagination.constants.ts.ejs | 0 .../config/translation.config.ts.ejs | 0 .../config/uib-pagination.config.ts.ejs | 2 +- .../webapp/app/core/user/user.service.ts.ejs | 2 +- .../layouts/navbar/navbar.component.ts.ejs | 2 +- .../app/shared/translate.directive.ts.ejs | 2 +- .../register/register.component.spec.ts.ejs | 2 +- ...er-management-detail.component.spec.ts.ejs | 2 +- ...er-management-update.component.spec.ts.ejs | 2 +- .../app/core/user/account.service.spec.ts.ejs | 2 +- .../app/core/user/user.service.spec.ts.ejs | 2 +- .../entity-management-routing.module.ts.ejs | 2 +- .../entity-management-update.component.ts.ejs | 2 +- .../entity-management.component.ts.ejs | 2 +- .../webapp/app/entities/entity.service.ts.ejs | 2 +- .../entity-management.service.spec.ts.ejs | 2 +- generators/generator-base-private.js | 4 +-- test/needle-api/needle-client-angular.spec.js | 4 +-- test/utils/expected-files.js | 26 +++++++++---------- 38 files changed, 54 insertions(+), 54 deletions(-) rename generators/client/templates/angular/src/main/webapp/app/{core => }/config/authority.constants.ts.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/{core => }/config/datepicker-adapter.ts.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/{core => }/config/dayjs.ts.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/{core => }/config/error.constants.ts.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/{core => }/config/font-awesome-icons.ts.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/{core => }/config/input.constants.ts.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/{core => }/config/language.constants.ts.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/{core => }/config/pagination.constants.ts.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/{core => }/config/translation.config.ts.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/{core => }/config/uib-pagination.config.ts.ejs (93%) diff --git a/generators/cleanup.js b/generators/cleanup.js index a9c5960c822b..0e5d3163d178 100644 --- a/generators/cleanup.js +++ b/generators/cleanup.js @@ -153,9 +153,9 @@ function cleanupOldFiles(generator) { generator.removeFile('tslint.json'); // unreleased files and folders cleanup for v7 developers - generator.removeFile(`${ANGULAR_DIR}config/dayjs.ts`); generator.removeFile(`${ANGULAR_DIR}shared/duration.pipe.ts`); generator.removeFile(`${ANGULAR_DIR}core/user/authority.model.ts`); + generator.removeFolder(`${ANGULAR_DIR}core/config`); generator.removeFolder(`${ANGULAR_DIR}core/event-manager`); generator.removeFolder(`${CLIENT_TEST_SRC_DIR}spec/app/core/event-manager`); } else if (generator.jhipsterConfig.clientFramework === REACT) { diff --git a/generators/client/files-angular.js b/generators/client/files-angular.js index ccfa0014ea43..f10304af80ce 100644 --- a/generators/client/files-angular.js +++ b/generators/client/files-angular.js @@ -307,14 +307,14 @@ const files = { 'core/util/event-manager.service.ts', // config - 'core/config/uib-pagination.config.ts', - 'core/config/dayjs.ts', - 'core/config/datepicker-adapter.ts', - 'core/config/font-awesome-icons.ts', - 'core/config/error.constants.ts', - 'core/config/input.constants.ts', - 'core/config/pagination.constants.ts', - 'core/config/authority.constants.ts', + 'config/uib-pagination.config.ts', + 'config/dayjs.ts', + 'config/datepicker-adapter.ts', + 'config/font-awesome-icons.ts', + 'config/error.constants.ts', + 'config/input.constants.ts', + 'config/pagination.constants.ts', + 'config/authority.constants.ts', // interceptors 'core/interceptor/error-handler.interceptor.ts', @@ -340,7 +340,7 @@ const files = { { condition: generator => generator.enableTranslation, path: ANGULAR_DIR, - templates: ['core/config/language.constants.ts', 'core/config/translation.config.ts'], + templates: ['config/language.constants.ts', 'config/translation.config.ts'], }, ], angularShared: [ diff --git a/generators/client/needle-api/needle-client-angular.js b/generators/client/needle-api/needle-client-angular.js index be915a9911ae..b96221d23a69 100644 --- a/generators/client/needle-api/needle-client-angular.js +++ b/generators/client/needle-api/needle-client-angular.js @@ -121,7 +121,7 @@ module.exports = class extends needleClientBase { } addIcon(iconName) { - const iconsPath = `${this.CLIENT_MAIN_SRC_DIR}app/core/config/font-awesome-icons.ts`; + const iconsPath = `${this.CLIENT_MAIN_SRC_DIR}app/config/font-awesome-icons.ts`; const iconImport = `fa${this.generator.upperFirstCamelCase(iconName)}`; if (!jhipsterUtils.checkRegexInFile(iconsPath, new RegExp(`\\b${iconImport}\\b`), this.generator)) { try { diff --git a/generators/client/templates/angular/src/main/webapp/app/account/password/password.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password.route.ts.ejs index 64ea4023df67..0a2853034814 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password/password.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password/password.route.ts.ejs @@ -20,7 +20,7 @@ import { Route } from '@angular/router'; import { UserRouteAccessService } from 'app/core/auth/user-route-access.service'; import { PasswordComponent } from './password.component'; -import { Authority } from 'app/core/config/authority.constants'; +import { Authority } from 'app/config/authority.constants'; export const passwordRoute: Route = { path: 'password', diff --git a/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.ts.ejs index 976fcc5ae644..d7fe54fd357a 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.ts.ejs @@ -23,7 +23,7 @@ import { FormBuilder, Validators } from '@angular/forms'; import { TranslateService } from '@ngx-translate/core'; <%_ } _%> -import { EMAIL_ALREADY_USED_TYPE, LOGIN_ALREADY_USED_TYPE } from 'app/core/config/error.constants'; +import { EMAIL_ALREADY_USED_TYPE, LOGIN_ALREADY_USED_TYPE } from 'app/config/error.constants'; import { RegisterService } from './register.service'; @Component({ diff --git a/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.route.ts.ejs index 5e3f2b195925..d5cd1d98acbb 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.route.ts.ejs @@ -18,7 +18,7 @@ -%> import { Route } from '@angular/router'; -import { Authority } from 'app/core/config/authority.constants'; +import { Authority } from 'app/config/authority.constants'; import { UserRouteAccessService } from 'app/core/auth/user-route-access.service'; import { SessionsComponent } from './sessions.component'; diff --git a/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.ts.ejs index cff88d46e68a..7a63e079d7b8 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.ts.ejs @@ -25,7 +25,7 @@ import { TranslateService } from '@ngx-translate/core'; import { AccountService } from 'app/core/auth/account.service'; import { Account } from 'app/core/user/account.model'; <%_ if (enableTranslation) { _%> -import { LANGUAGES } from 'app/core/config/language.constants'; +import { LANGUAGES } from 'app/config/language.constants'; <%_ } _%> @Component({ diff --git a/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.route.ts.ejs index 1f476198cfbc..8a7b7670e7fa 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.route.ts.ejs @@ -20,7 +20,7 @@ import { Route } from '@angular/router'; import { UserRouteAccessService } from 'app/core/auth/user-route-access.service'; import { SettingsComponent } from './settings.component'; -import { Authority } from 'app/core/config/authority.constants'; +import { Authority } from 'app/config/authority.constants'; export const settingsRoute: Route = { path: 'settings', diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management-update.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management-update.component.ts.ejs index 3d750939c8c0..51a77ad59e2d 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management-update.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management-update.component.ts.ejs @@ -21,7 +21,7 @@ import { FormBuilder, Validators } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; <%_ if (enableTranslation) { _%> -import { LANGUAGES } from 'app/core/config/language.constants'; +import { LANGUAGES } from 'app/config/language.constants'; <%_ } _%> import { User } from 'app/core/user/user.model'; import { UserService } from 'app/core/user/user.service'; diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs index 0224c753ca05..fd771b90d65b 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs @@ -25,7 +25,7 @@ import { combineLatest } from 'rxjs'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; <%_ if (prodDatabaseType !== 'cassandra') { _%> -import { ITEMS_PER_PAGE } from 'app/core/config/pagination.constants'; +import { ITEMS_PER_PAGE } from 'app/config/pagination.constants'; <%_ } _%> import { AccountService } from 'app/core/auth/account.service'; import { Account } from 'app/core/user/account.model'; diff --git a/generators/client/templates/angular/src/main/webapp/app/app-routing.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/app-routing.module.ts.ejs index 5ebde6605cc6..81e6997735ac 100644 --- a/generators/client/templates/angular/src/main/webapp/app/app-routing.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/app-routing.module.ts.ejs @@ -21,7 +21,7 @@ import { RouterModule } from '@angular/router'; import { errorRoute } from './layouts/error/error.route'; import { navbarRoute } from './layouts/navbar/navbar.route'; import { DEBUG_INFO_ENABLED } from 'app/app.constants'; -import { Authority } from 'app/core/config/authority.constants'; +import { Authority } from 'app/config/authority.constants'; import { UserRouteAccessService } from 'app/core/auth/user-route-access.service'; diff --git a/generators/client/templates/angular/src/main/webapp/app/app.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/app.module.ts.ejs index 689842adbbfb..0f59a43edb40 100644 --- a/generators/client/templates/angular/src/main/webapp/app/app.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/app.module.ts.ejs @@ -36,20 +36,20 @@ import { NgxWebstorageModule } from 'ngx-webstorage'; import * as dayjs from 'dayjs'; import { NgbDateAdapter, NgbDatepickerConfig } from '@ng-bootstrap/ng-bootstrap'; -import './core/config/dayjs'; +import './config/dayjs'; import { SharedModule } from 'app/shared/shared.module'; import { AppRoutingModule } from './app-routing.module'; import { HomeModule } from './home/home.module'; import { EntityRoutingModule } from './entities/entity-routing.module'; // jhipster-needle-angular-add-module-import JHipster will add new module here -import { NgbDateDayjsAdapter } from 'app/core/config/datepicker-adapter'; -import { fontAwesomeIcons } from 'app/core/config/font-awesome-icons'; +import { NgbDateDayjsAdapter } from './config/datepicker-adapter'; +import { fontAwesomeIcons } from './config/font-awesome-icons'; import { httpInterceptorProviders } from 'app/core/interceptor/index'; <%_ if (enableI18nRTL) { _%> import { FindLanguageFromKeyPipe } from 'app/shared/find-language-from-key.pipe'; <%_ } _%> <%_ if (enableTranslation) { _%> -import { translatePartialLoader, missingTranslationHandler } from 'app/core/config/translation.config'; +import { translatePartialLoader, missingTranslationHandler } from './config/translation.config'; <%_ } _%> import { MainComponent } from './layouts/main/main.component'; import { NavbarComponent } from './layouts/navbar/navbar.component'; diff --git a/generators/client/templates/angular/src/main/webapp/app/core/config/authority.constants.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/authority.constants.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/core/config/authority.constants.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/config/authority.constants.ts.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/core/config/datepicker-adapter.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/datepicker-adapter.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/core/config/datepicker-adapter.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/config/datepicker-adapter.ts.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/core/config/dayjs.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/dayjs.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/core/config/dayjs.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/config/dayjs.ts.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/core/config/error.constants.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/error.constants.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/core/config/error.constants.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/config/error.constants.ts.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/core/config/font-awesome-icons.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/font-awesome-icons.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/core/config/font-awesome-icons.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/config/font-awesome-icons.ts.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/core/config/input.constants.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/input.constants.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/core/config/input.constants.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/config/input.constants.ts.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/core/config/language.constants.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/language.constants.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/core/config/language.constants.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/config/language.constants.ts.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/core/config/pagination.constants.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/pagination.constants.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/core/config/pagination.constants.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/config/pagination.constants.ts.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/core/config/translation.config.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/translation.config.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/core/config/translation.config.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/config/translation.config.ts.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/core/config/uib-pagination.config.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/uib-pagination.config.ts.ejs similarity index 93% rename from generators/client/templates/angular/src/main/webapp/app/core/config/uib-pagination.config.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/config/uib-pagination.config.ts.ejs index d4abbc87f71e..01a39f731bd2 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/config/uib-pagination.config.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/config/uib-pagination.config.ts.ejs @@ -18,7 +18,7 @@ -%> import { Injectable } from '@angular/core'; import { NgbPaginationConfig } from '@ng-bootstrap/ng-bootstrap'; -import { ITEMS_PER_PAGE } from 'app/core/config/pagination.constants'; +import { ITEMS_PER_PAGE } from 'app/config/pagination.constants'; @Injectable({ providedIn: 'root' }) export class PaginationConfig { diff --git a/generators/client/templates/angular/src/main/webapp/app/core/user/user.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/user/user.service.ts.ejs index 7ecff52a3d30..29a3c61f38c6 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/user/user.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/user/user.service.ts.ejs @@ -25,7 +25,7 @@ import { createRequestOption } from 'app/core/request/request-util'; import { Pagination } from 'app/core/request/request.model'; import { IUser } from './user.model'; <%_ if (authenticationType !== 'oauth2' && databaseType !== 'sql' && databaseType !== 'mongodb' && databaseType !== 'couchbase') { _%> -import { Authority } from 'app/core/config/authority.constants'; +import { Authority } from 'app/config/authority.constants'; <%_ } _%> @Injectable({ providedIn: 'root' }) diff --git a/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs index b04989e40e75..a2e32655b532 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs @@ -25,7 +25,7 @@ import { SessionStorageService } from 'ngx-webstorage'; import { VERSION } from 'app/app.constants'; <%_ if (enableTranslation) { _%> -import { LANGUAGES } from 'app/core/config/language.constants'; +import { LANGUAGES } from 'app/config/language.constants'; <%_ } _%> import { AccountService } from 'app/core/auth/account.service'; import { LoginService } from 'app/login/login.service'; diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/translate.directive.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/translate.directive.ts.ejs index fb4973c199f6..df5001c3d6a8 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/translate.directive.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/translate.directive.ts.ejs @@ -21,7 +21,7 @@ import { TranslateService } from '@ngx-translate/core'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { translationNotFoundMessage } from 'app/core/config/translation.config'; +import { translationNotFoundMessage } from 'app/config/translation.config'; /** * A wrapper directive on top of the translate pipe as the inbuilt translate directive from ngx-translate is too verbose and buggy diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/account/register/register.component.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/account/register/register.component.spec.ts.ejs index 73b508a00076..34d3e260bdd1 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/account/register/register.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/account/register/register.component.spec.ts.ejs @@ -28,7 +28,7 @@ import { of, throwError } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; <%_ } _%> -import { EMAIL_ALREADY_USED_TYPE, LOGIN_ALREADY_USED_TYPE } from 'app/core/config/error.constants'; +import { EMAIL_ALREADY_USED_TYPE, LOGIN_ALREADY_USED_TYPE } from 'app/config/error.constants'; import { RegisterService } from 'app/account/register/register.service'; import { RegisterComponent } from 'app/account/register/register.component'; diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts.ejs index d11c4dc427a0..7578aa99bb46 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts.ejs @@ -23,7 +23,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; -import { Authority } from 'app/core/config/authority.constants'; +import { Authority } from 'app/config/authority.constants'; import { UserManagementDetailComponent } from 'app/admin/user-management/user-management-detail.component'; import { User } from 'app/core/user/user.model'; diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts.ejs index 67dfdd0cc110..74da60e34ab7 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts.ejs @@ -26,7 +26,7 @@ import { FormBuilder } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; -import { Authority } from 'app/core/config/authority.constants'; +import { Authority } from 'app/config/authority.constants'; import { UserManagementUpdateComponent } from 'app/admin/user-management/user-management-update.component'; import { UserService } from 'app/core/user/user.service'; import { User } from 'app/core/user/user.model'; diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/core/user/account.service.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/core/user/account.service.spec.ts.ejs index c546ed466e6a..54f4ec81c6f1 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/core/user/account.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/core/user/account.service.spec.ts.ejs @@ -36,7 +36,7 @@ import { NgxWebstorageModule } from 'ngx-webstorage'; import { SERVER_API_URL } from 'app/app.constants'; import { AccountService } from 'app/core/auth/account.service'; import { Account } from 'app/core/user/account.model'; -import { Authority } from 'app/core/config/authority.constants'; +import { Authority } from 'app/config/authority.constants'; import { StateStorageService } from 'app/core/auth/state-storage.service'; <%_ if (websocket === 'spring-websocket') { _%> import { TrackerService } from 'app/core/tracker/tracker.service'; diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/core/user/user.service.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/core/user/user.service.spec.ts.ejs index b29747d41064..22f67084e34c 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/core/user/user.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/core/user/user.service.spec.ts.ejs @@ -24,7 +24,7 @@ import { HttpErrorResponse } from '@angular/common/http'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; <%_ if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'couchbase') { _%> -import { Authority } from 'app/core/config/authority.constants'; +import { Authority } from 'app/config/authority.constants'; <%_ } _%> import { UserService } from 'app/core/user/user.service'; import { User } from 'app/core/user/user.model'; diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs index 157bd39ea933..d68c2458ea5c 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs @@ -20,7 +20,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { Authority } from 'app/core/config/authority.constants'; +import { Authority } from 'app/config/authority.constants'; import { UserRouteAccessService } from 'app/core/auth/user-route-access.service'; import { <%= entityAngularName %>Component } from './<%= entityFileName %>.component'; import { <%= entityAngularName %>DetailComponent } from './<%= entityFileName %>-detail.component'; diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-update.component.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-update.component.ts.ejs index d38d3ce00d5c..65a330d52f32 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-update.component.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-update.component.ts.ejs @@ -47,7 +47,7 @@ import { map } from 'rxjs/operators'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; <%_ if (fieldsContainInstant || fieldsContainZonedDateTime) { _%> import * as dayjs from 'dayjs'; -import { DATE_TIME_FORMAT } from 'app/core/config/input.constants'; +import { DATE_TIME_FORMAT } from 'app/config/input.constants'; <%_ } _%> import { I<%= entityAngularName %>, <%= entityAngularName %> } from 'app/shared/model/<%= entityModelFileName %>.model'; diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.component.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.component.ts.ejs index a6bf947486af..687576957c4e 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.component.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.component.ts.ejs @@ -30,7 +30,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { I<%= entityAngularName %> } from 'app/shared/model/<%= entityModelFileName %>.model'; <%_ if (pagination !== 'no') { %> -import { ITEMS_PER_PAGE } from 'app/core/config/pagination.constants'; +import { ITEMS_PER_PAGE } from 'app/config/pagination.constants'; <%_ } _%> import { <%= entityAngularName %>Service } from './<%= entityFileName %>.service'; <%_ if (!readOnly) { _%> diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity.service.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity.service.ts.ejs index 67f5a40f2897..fa95d9ac1458 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity.service.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity.service.ts.ejs @@ -31,7 +31,7 @@ import * as dayjs from 'dayjs'; <%_ } _%> <%_ if (fieldsContainLocalDate) { _%> -import { DATE_FORMAT } from 'app/core/config/input.constants'; +import { DATE_FORMAT } from 'app/config/input.constants'; <%_ } _%> import { SERVER_API_URL } from 'app/app.constants'; import { createRequestOption } from 'app/core/request/request-util'; diff --git a/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/entity-management.service.spec.ts.ejs b/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/entity-management.service.spec.ts.ejs index 8d5bcd8146ed..ce390b768851 100644 --- a/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/entity-management.service.spec.ts.ejs +++ b/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/entity-management.service.spec.ts.ejs @@ -25,7 +25,7 @@ import { TestBed } from '@angular/core/testing'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; <%_ if (fieldsContainDate) { _%> import * as dayjs from 'dayjs'; -import { <% if (fieldsContainLocalDate) { %>DATE_FORMAT,<% } if (fieldsContainInstant || fieldsContainZonedDateTime) { %> DATE_TIME_FORMAT<% } %> } from 'app/core/config/input.constants'; +import { <% if (fieldsContainLocalDate) { %>DATE_FORMAT,<% } if (fieldsContainInstant || fieldsContainZonedDateTime) { %> DATE_TIME_FORMAT<% } %> } from 'app/config/input.constants'; <%_ } _%> import { <%= entityAngularName %>Service } from 'app/entities/<%= entityFolderName %>/<%= entityFileName %>.service'; import { I<%= entityAngularName %>, <%= entityAngularName %> } from 'app/shared/model/<%= entityModelFileName %>.model'; diff --git a/generators/generator-base-private.js b/generators/generator-base-private.js index a25a34eec8a0..ff4abd092109 100644 --- a/generators/generator-base-private.js +++ b/generators/generator-base-private.js @@ -239,7 +239,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator { if (this.clientFramework !== ANGULAR) { return; } - const fullPath = `${this.CLIENT_MAIN_SRC_DIR}app/core/config/language.constants.ts`; + const fullPath = `${this.CLIENT_MAIN_SRC_DIR}app/config/language.constants.ts`; try { let content = 'export const LANGUAGES: string[] = [\n'; languages.forEach((language, i) => { @@ -426,7 +426,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator { if (this.clientFramework === VUE) { fullPath = `${this.CLIENT_MAIN_SRC_DIR}app/shared/config/dayjs.ts`; } else if (this.clientFramework === ANGULAR) { - fullPath = `${this.CLIENT_MAIN_SRC_DIR}app/core/config/dayjs.ts`; + fullPath = `${this.CLIENT_MAIN_SRC_DIR}app/config/dayjs.ts`; } try { const content = languages.reduce( diff --git a/test/needle-api/needle-client-angular.spec.js b/test/needle-api/needle-client-angular.spec.js index 335818b1f8d6..ff8261e417a5 100644 --- a/test/needle-api/needle-client-angular.spec.js +++ b/test/needle-api/needle-client-angular.spec.js @@ -140,7 +140,7 @@ describe('needle API Angular: JHipster client generator with blueprint', () => { }); it('icon imports contains a new icon added by a new menu method of needle api ', () => { - assert.fileContent(`${CLIENT_MAIN_SRC_DIR}app/core/config/font-awesome-icons.ts`, ' faIconName1'); + assert.fileContent(`${CLIENT_MAIN_SRC_DIR}app/config/font-awesome-icons.ts`, ' faIconName1'); }); it('admin menu contains the admin element added by needle api', () => { @@ -156,7 +156,7 @@ describe('needle API Angular: JHipster client generator with blueprint', () => { }); it('icon imports contains a new icon added by a new admin menu method of needle api ', () => { - assert.fileContent(`${CLIENT_MAIN_SRC_DIR}app/core/config/font-awesome-icons.ts`, ' faIconName2'); + assert.fileContent(`${CLIENT_MAIN_SRC_DIR}app/config/font-awesome-icons.ts`, ' faIconName2'); }); it('entity menu contains the entity added by needle api', () => { diff --git a/test/utils/expected-files.js b/test/utils/expected-files.js index 7c162c56a754..e1473912ed49 100644 --- a/test/utils/expected-files.js +++ b/test/utils/expected-files.js @@ -393,12 +393,12 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/app-routing.module.ts`, `${CLIENT_MAIN_SRC_DIR}app/app.constants.ts`, `${CLIENT_MAIN_SRC_DIR}app/app.module.ts`, - `${CLIENT_MAIN_SRC_DIR}app/core/config/uib-pagination.config.ts`, + `${CLIENT_MAIN_SRC_DIR}app/config/uib-pagination.config.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/interceptor/auth-expired.interceptor.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/interceptor/error-handler.interceptor.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/interceptor/notification.interceptor.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/interceptor/index.ts`, - `${CLIENT_MAIN_SRC_DIR}app/core/config/dayjs.ts`, + `${CLIENT_MAIN_SRC_DIR}app/config/dayjs.ts`, `${CLIENT_MAIN_SRC_DIR}app/entities/entity-routing.module.ts`, `${CLIENT_MAIN_SRC_DIR}app/home/home.component.html`, `${CLIENT_MAIN_SRC_DIR}app/home/home.component.ts`, @@ -437,21 +437,21 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/shared/alert/alert-error.model.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/alert/alert.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/auth/account.service.ts`, - `${CLIENT_MAIN_SRC_DIR}app/core/config/font-awesome-icons.ts`, + `${CLIENT_MAIN_SRC_DIR}app/config/font-awesome-icons.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/has-any-authority.directive.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/auth/state-storage.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/auth/user-route-access.service.ts`, - `${CLIENT_MAIN_SRC_DIR}app/core/config/authority.constants.ts`, - `${CLIENT_MAIN_SRC_DIR}app/core/config/error.constants.ts`, - `${CLIENT_MAIN_SRC_DIR}app/core/config/input.constants.ts`, - `${CLIENT_MAIN_SRC_DIR}app/core/config/pagination.constants.ts`, + `${CLIENT_MAIN_SRC_DIR}app/config/authority.constants.ts`, + `${CLIENT_MAIN_SRC_DIR}app/config/error.constants.ts`, + `${CLIENT_MAIN_SRC_DIR}app/config/input.constants.ts`, + `${CLIENT_MAIN_SRC_DIR}app/config/pagination.constants.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/date/duration.pipe.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/date/format-medium-date.pipe.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/date/format-medium-datetime.pipe.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/find-language-from-key.pipe.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/translate.directive.ts`, - `${CLIENT_MAIN_SRC_DIR}app/core/config/language.constants.ts`, - `${CLIENT_MAIN_SRC_DIR}app/core/config/translation.config.ts`, + `${CLIENT_MAIN_SRC_DIR}app/config/language.constants.ts`, + `${CLIENT_MAIN_SRC_DIR}app/config/translation.config.ts`, `${CLIENT_MAIN_SRC_DIR}app/login/login.model.ts`, `${CLIENT_MAIN_SRC_DIR}app/login/login.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/request/request-util.ts`, @@ -460,7 +460,7 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/core/util/data-util.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/util/parse-links.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/util/alert.service.ts`, - `${CLIENT_MAIN_SRC_DIR}app/core/config/datepicker-adapter.ts`, + `${CLIENT_MAIN_SRC_DIR}app/config/datepicker-adapter.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/shared-libs.module.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/shared.module.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/user/account.model.ts`, @@ -593,8 +593,8 @@ const expectedFiles = { `${SERVER_MAIN_RES_DIR}i18n/messages_fr.properties`, `${CLIENT_MAIN_SRC_DIR}i18n/en/global.json`, `${CLIENT_MAIN_SRC_DIR}i18n/fr/global.json`, - `${CLIENT_MAIN_SRC_DIR}app/core/config/language.constants.ts`, - `${CLIENT_MAIN_SRC_DIR}app/core/config/translation.config.ts`, + `${CLIENT_MAIN_SRC_DIR}app/config/language.constants.ts`, + `${CLIENT_MAIN_SRC_DIR}app/config/translation.config.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/find-language-from-key.pipe.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/translate.directive.ts`, ], @@ -604,7 +604,7 @@ const expectedFiles = { `${SERVER_MAIN_RES_DIR}i18n/messages_ar_LY.properties`, `${CLIENT_MAIN_SRC_DIR}i18n/en/global.json`, `${CLIENT_MAIN_SRC_DIR}i18n/ar-ly/global.json`, - `${CLIENT_MAIN_SRC_DIR}app/core/config/language.constants.ts`, + `${CLIENT_MAIN_SRC_DIR}app/config/language.constants.ts`, `${CLIENT_MAIN_SRC_DIR}content/scss/rtl.scss`, `${CLIENT_MAIN_SRC_DIR}app/shared/find-language-from-key.pipe.ts`, ], From 4471f4d5d5b7207d49cdde6522d3fe1856024613 Mon Sep 17 00:00:00 2001 From: Daniel Franco Date: Sun, 29 Nov 2020 15:09:58 +0000 Subject: [PATCH 0033/1179] Update NPM version to 6.14.9 --- generators/generator-constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generator-constants.js b/generators/generator-constants.js index 6041e27829e4..6c635f6642fd 100644 --- a/generators/generator-constants.js +++ b/generators/generator-constants.js @@ -31,7 +31,7 @@ const JAVA_VERSION = '11'; // Java version is forced to be 11. We keep the varia const HUSKY_VERSION = '4.3.0'; const LINT_STAGED_VERSION = '10.5.1'; const NODE_VERSION = '14.15.0'; -const NPM_VERSION = '6.14.8'; +const NPM_VERSION = '6.14.9'; const GRADLE_VERSION = '6.7'; const JIB_VERSION = '2.6.0'; From 6a692c3413e80759efbf3cbfc0378c72d90f78ac Mon Sep 17 00:00:00 2001 From: Daniel Franco Date: Sun, 29 Nov 2020 15:27:18 +0000 Subject: [PATCH 0034/1179] Update mariadb docker image version to 10.5.8 --- generators/generator-constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generator-constants.js b/generators/generator-constants.js index 6041e27829e4..4d0b12641730 100644 --- a/generators/generator-constants.js +++ b/generators/generator-constants.js @@ -59,7 +59,7 @@ const DOCKER_JHIPSTER_REGISTRY = 'jhipster/jhipster-registry:v6.4.0'; const DOCKER_JHIPSTER_CONTROL_CENTER = 'jhipster/jhipster-control-center:v0.1.0'; const DOCKER_JAVA_JRE = 'adoptopenjdk:11-jre-hotspot'; const DOCKER_MYSQL = 'mysql:8.0.22'; -const DOCKER_MARIADB = 'mariadb:10.5.6'; +const DOCKER_MARIADB = 'mariadb:10.5.8'; const DOCKER_POSTGRESQL = 'postgres:13.0'; const DOCKER_MONGODB = 'mongo:4.4.1'; const DOCKER_COUCHBASE = 'couchbase:6.6.0'; From e101a99b05ebc53fe97bb1fae5476182516d638a Mon Sep 17 00:00:00 2001 From: Daniel Franco Date: Sun, 29 Nov 2020 15:28:19 +0000 Subject: [PATCH 0035/1179] Update postgres docker image version to 13.1 --- generators/generator-constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generator-constants.js b/generators/generator-constants.js index 4d0b12641730..cb59f095277d 100644 --- a/generators/generator-constants.js +++ b/generators/generator-constants.js @@ -60,7 +60,7 @@ const DOCKER_JHIPSTER_CONTROL_CENTER = 'jhipster/jhipster-control-center:v0.1.0' const DOCKER_JAVA_JRE = 'adoptopenjdk:11-jre-hotspot'; const DOCKER_MYSQL = 'mysql:8.0.22'; const DOCKER_MARIADB = 'mariadb:10.5.8'; -const DOCKER_POSTGRESQL = 'postgres:13.0'; +const DOCKER_POSTGRESQL = 'postgres:13.1'; const DOCKER_MONGODB = 'mongo:4.4.1'; const DOCKER_COUCHBASE = 'couchbase:6.6.0'; const DOCKER_CASSANDRA = 'cassandra:3.11.8'; From 69a636048dbb5472dd69cdd9ae1ef7b72b7be425 Mon Sep 17 00:00:00 2001 From: Daniel Franco Date: Sun, 29 Nov 2020 15:28:56 +0000 Subject: [PATCH 0036/1179] Update mongo docker image version to 4.4.2 --- generators/generator-constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generator-constants.js b/generators/generator-constants.js index cb59f095277d..eaab7e13df60 100644 --- a/generators/generator-constants.js +++ b/generators/generator-constants.js @@ -61,7 +61,7 @@ const DOCKER_JAVA_JRE = 'adoptopenjdk:11-jre-hotspot'; const DOCKER_MYSQL = 'mysql:8.0.22'; const DOCKER_MARIADB = 'mariadb:10.5.8'; const DOCKER_POSTGRESQL = 'postgres:13.1'; -const DOCKER_MONGODB = 'mongo:4.4.1'; +const DOCKER_MONGODB = 'mongo:4.4.2'; const DOCKER_COUCHBASE = 'couchbase:6.6.0'; const DOCKER_CASSANDRA = 'cassandra:3.11.8'; const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04'; From a40d9eecd64b808f9f50b53bd7b0bb0cfd81582a Mon Sep 17 00:00:00 2001 From: Daniel Franco Date: Sun, 29 Nov 2020 15:30:15 +0000 Subject: [PATCH 0037/1179] Update cassandra docker image version to 3.11.9 --- generators/generator-constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generator-constants.js b/generators/generator-constants.js index eaab7e13df60..2abefab9a1a7 100644 --- a/generators/generator-constants.js +++ b/generators/generator-constants.js @@ -63,7 +63,7 @@ const DOCKER_MARIADB = 'mariadb:10.5.8'; const DOCKER_POSTGRESQL = 'postgres:13.1'; const DOCKER_MONGODB = 'mongo:4.4.2'; const DOCKER_COUCHBASE = 'couchbase:6.6.0'; -const DOCKER_CASSANDRA = 'cassandra:3.11.8'; +const DOCKER_CASSANDRA = 'cassandra:3.11.9'; const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04'; const DOCKER_NEO4J = 'neo4j:4.1.3'; const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.0.3'; From a5a7aa4822526b71be122a62ead0924daed92587 Mon Sep 17 00:00:00 2001 From: Daniel Franco Date: Sun, 29 Nov 2020 15:33:50 +0000 Subject: [PATCH 0038/1179] Update neo4j docker image version to 4.2.0 --- generators/generator-constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generator-constants.js b/generators/generator-constants.js index 2abefab9a1a7..cf540013a8d4 100644 --- a/generators/generator-constants.js +++ b/generators/generator-constants.js @@ -65,7 +65,7 @@ const DOCKER_MONGODB = 'mongo:4.4.2'; const DOCKER_COUCHBASE = 'couchbase:6.6.0'; const DOCKER_CASSANDRA = 'cassandra:3.11.9'; const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04'; -const DOCKER_NEO4J = 'neo4j:4.1.3'; +const DOCKER_NEO4J = 'neo4j:4.2.0'; const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.0.3'; const DOCKER_MEMCACHED = 'memcached:1.6.8-alpine'; const DOCKER_REDIS = 'redis:6.0.9'; From 53191dbc6cd467f938c35e9474c320f9d8f9f87e Mon Sep 17 00:00:00 2001 From: Daniel Franco Date: Sun, 29 Nov 2020 15:36:24 +0000 Subject: [PATCH 0039/1179] Update hazelcast/management-center docker image version to 4.2020.10 --- generators/generator-constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generator-constants.js b/generators/generator-constants.js index cf540013a8d4..229212e169af 100644 --- a/generators/generator-constants.js +++ b/generators/generator-constants.js @@ -66,7 +66,7 @@ const DOCKER_COUCHBASE = 'couchbase:6.6.0'; const DOCKER_CASSANDRA = 'cassandra:3.11.9'; const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04'; const DOCKER_NEO4J = 'neo4j:4.2.0'; -const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.0.3'; +const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.2020.10'; const DOCKER_MEMCACHED = 'memcached:1.6.8-alpine'; const DOCKER_REDIS = 'redis:6.0.9'; const DOCKER_KEYCLOAK = 'jboss/keycloak:11.0.1'; // The version should match the attribute 'keycloakVersion' from /docker-compose/templates/realm-config/jhipster-realm.json.ejs and /server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs From 05b298f8ff98094749ae22e892bbef7c8f61ef14 Mon Sep 17 00:00:00 2001 From: Daniel Franco Date: Sun, 29 Nov 2020 15:37:19 +0000 Subject: [PATCH 0040/1179] Update memcached docker image version to 1.6.9-alpine --- generators/generator-constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generator-constants.js b/generators/generator-constants.js index 229212e169af..5f9d93e9e678 100644 --- a/generators/generator-constants.js +++ b/generators/generator-constants.js @@ -67,7 +67,7 @@ const DOCKER_CASSANDRA = 'cassandra:3.11.9'; const DOCKER_MSSQL = 'mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04'; const DOCKER_NEO4J = 'neo4j:4.2.0'; const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:4.2020.10'; -const DOCKER_MEMCACHED = 'memcached:1.6.8-alpine'; +const DOCKER_MEMCACHED = 'memcached:1.6.9-alpine'; const DOCKER_REDIS = 'redis:6.0.9'; const DOCKER_KEYCLOAK = 'jboss/keycloak:11.0.1'; // The version should match the attribute 'keycloakVersion' from /docker-compose/templates/realm-config/jhipster-realm.json.ejs and /server/templates/src/main/docker/config/realm-config/jhipster-realm.json.ejs const DOCKER_ELASTICSEARCH = 'docker.elastic.co/elasticsearch/elasticsearch:7.6.2'; // The version should be coherent with the one from spring-data-elasticsearch project From 1e9dfb66e41b887e3ddeac39ba34afb3ceb345da Mon Sep 17 00:00:00 2001 From: Daniel Franco Date: Sun, 29 Nov 2020 15:40:11 +0000 Subject: [PATCH 0041/1179] Update consul docker image version to 1.9.0 --- generators/generator-constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generator-constants.js b/generators/generator-constants.js index 5f9d93e9e678..fd9ad6f1e950 100644 --- a/generators/generator-constants.js +++ b/generators/generator-constants.js @@ -75,7 +75,7 @@ const DOCKER_KAFKA = `confluentinc/cp-kafka:${KAFKA_VERSION}`; const DOCKER_ZOOKEEPER = `confluentinc/cp-zookeeper:${KAFKA_VERSION}`; const DOCKER_SONAR = 'sonarqube:8.5.1-community'; const DOCKER_TRAEFIK = 'traefik:1.7.26'; // waiting for https://github.com/jhipster/generator-jhipster/issues/11198 -const DOCKER_CONSUL = 'consul:1.8.5'; +const DOCKER_CONSUL = 'consul:1.9.0'; const DOCKER_CONSUL_CONFIG_LOADER = 'jhipster/consul-config-loader:v0.4.1'; const DOCKER_PROMETHEUS = 'prom/prometheus:v2.22.0'; const DOCKER_PROMETHEUS_ALERTMANAGER = 'prom/alertmanager:v0.21.0'; From 6b81814ca9fbd113078a397ed6792744b3b15aa8 Mon Sep 17 00:00:00 2001 From: Daniel Franco Date: Sun, 29 Nov 2020 15:41:02 +0000 Subject: [PATCH 0042/1179] Update prom/prometheus docker image version to v2.23.0 --- generators/generator-constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generator-constants.js b/generators/generator-constants.js index fd9ad6f1e950..43fde8c86c6c 100644 --- a/generators/generator-constants.js +++ b/generators/generator-constants.js @@ -77,7 +77,7 @@ const DOCKER_SONAR = 'sonarqube:8.5.1-community'; const DOCKER_TRAEFIK = 'traefik:1.7.26'; // waiting for https://github.com/jhipster/generator-jhipster/issues/11198 const DOCKER_CONSUL = 'consul:1.9.0'; const DOCKER_CONSUL_CONFIG_LOADER = 'jhipster/consul-config-loader:v0.4.1'; -const DOCKER_PROMETHEUS = 'prom/prometheus:v2.22.0'; +const DOCKER_PROMETHEUS = 'prom/prometheus:v2.23.0'; const DOCKER_PROMETHEUS_ALERTMANAGER = 'prom/alertmanager:v0.21.0'; const DOCKER_GRAFANA = 'grafana/grafana:7.3.0'; const DOCKER_JENKINS = 'jenkins/jenkins:lts-jdk11'; From 6e1ea371d33f476ad3f48177a1cd2beb2b53e229 Mon Sep 17 00:00:00 2001 From: Daniel Franco Date: Sun, 29 Nov 2020 15:42:19 +0000 Subject: [PATCH 0043/1179] Update grafana/grafana docker image version to 7.3.4 --- generators/generator-constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/generator-constants.js b/generators/generator-constants.js index 43fde8c86c6c..6135a8faba5a 100644 --- a/generators/generator-constants.js +++ b/generators/generator-constants.js @@ -79,7 +79,7 @@ const DOCKER_CONSUL = 'consul:1.9.0'; const DOCKER_CONSUL_CONFIG_LOADER = 'jhipster/consul-config-loader:v0.4.1'; const DOCKER_PROMETHEUS = 'prom/prometheus:v2.23.0'; const DOCKER_PROMETHEUS_ALERTMANAGER = 'prom/alertmanager:v0.21.0'; -const DOCKER_GRAFANA = 'grafana/grafana:7.3.0'; +const DOCKER_GRAFANA = 'grafana/grafana:7.3.4'; const DOCKER_JENKINS = 'jenkins/jenkins:lts-jdk11'; const DOCKER_SWAGGER_EDITOR = 'swaggerapi/swagger-editor:latest'; const DOCKER_PROMETHEUS_OPERATOR = 'quay.io/coreos/prometheus-operator:v0.42.1'; From de0721f37f9ba2b198c2667dbfd2584b6a03831b Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Sun, 29 Nov 2020 12:56:57 -0300 Subject: [PATCH 0044/1179] Fix name conflict --- .../src/main/java/package/domain/Entity.java.ejs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs b/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs index 2881d99e859a..c3cd7fd70fec 100644 --- a/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs @@ -619,16 +619,16 @@ relationships.forEach((relationship, idx) => { <%_ if (relationship.otherRelationship && !relationship.reference.owned) { _%> if (this.<%= relationshipFieldNamePlural %> != null) { <%_ if (relationship.otherRelationship.reference.collection) { _%> - this.<%= relationshipFieldNamePlural %>.forEach(<%= otherEntityName %> -> <%= otherEntityName %>.remove<%= otherEntityRelationshipNameCapitalized %>(this)); + this.<%= relationshipFieldNamePlural %>.forEach(i -> i.remove<%= otherEntityRelationshipNameCapitalized %>(this)); <%_ } else { _%> - this.<%= relationshipFieldNamePlural %>.forEach(<%= otherEntityName %> -> <%= otherEntityName %>.set<%= otherEntityRelationshipNameCapitalized %>(null)); + this.<%= relationshipFieldNamePlural %>.forEach(i -> i.set<%= otherEntityRelationshipNameCapitalized %>(null)); <%_ } _%> } if (<%= otherEntityNamePlural %> != null) { <%_ if (relationship.otherRelationship.reference.collection) { _%> - <%= otherEntityNamePlural %>.forEach(<%= otherEntityName %> -> <%= otherEntityName %>.add<%= otherEntityRelationshipNameCapitalized %>(this)); + <%= otherEntityNamePlural %>.forEach(i -> i.add<%= otherEntityRelationshipNameCapitalized %>(this)); <%_ } else { _%> - <%= otherEntityNamePlural %>.forEach(<%= otherEntityName %> -> <%= otherEntityName %>.set<%= otherEntityRelationshipNameCapitalized %>(this)); + <%= otherEntityNamePlural %>.forEach(i -> i.set<%= otherEntityRelationshipNameCapitalized %>(this)); <%_ } _%> } <%_ } _%> From eaa4943cdabaa2d4303f57f5cbccb87a730ccb33 Mon Sep 17 00:00:00 2001 From: Mathieu Abou-Aichi Date: Sun, 29 Nov 2020 18:57:03 +0100 Subject: [PATCH 0045/1179] Added annotations to relationship sides Previous behaviour: the annotation added an option to both sides. New behaviour: an annotation on the source changes the destination, and one on the destination changes the source. Related to #12949 --- .../jdl-to-json-relationship-converter.js | 37 +++- .../json-to-jdl-entity-converter.js | 6 +- .../relationship-converter.js | 7 +- jdl/models/jdl-relationship.js | 69 +++++-- jdl/parsing/jdl-ast-builder-visitor.js | 24 ++- jdl/parsing/jdl-parser.js | 7 +- jdl/validators/relationship-validator.js | 2 +- ...jdl-to-json-relationship-converter.spec.js | 8 +- ...ith-applications-to-json-converter.spec.js | 8 +- ...hout-application-to-json-converter.spec.js | 8 +- ...parsed-jdl-to-jdl-object-converter.spec.js | 32 +++- .../relationship-converter.spec.js | 42 ++++- test/jdl/grammar/grammar.spec.js | 175 ++++++++++++++++-- test/jdl/jdl-importer.spec.js | 44 +++++ test/jdl/models/jdl-relationship.spec.js | 86 ++++++--- test/jdl/test-files/annotations.jdl | 2 +- .../test-files/capitalized_annotations.jdl | 2 +- .../validators/relationship-validator.spec.js | 6 +- 18 files changed, 470 insertions(+), 95 deletions(-) diff --git a/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js b/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js index e94125a72739..e87b710afbce 100644 --- a/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js +++ b/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js @@ -111,6 +111,7 @@ function setRelationshipsFromEntity(relatedRelationships, entityName) { convertedRelationship.ownerSide = true; } setOptionsForRelationship(relationshipToConvert, convertedRelationship); + setOptionsForRelationshipSourceSide(relationshipToConvert, convertedRelationship); const convertedEntityRelationships = convertedRelationships.get(entityName); convertedEntityRelationships.push(convertedRelationship); }); @@ -142,24 +143,52 @@ function setRelationshipsToEntity(relatedRelationships, entityName) { convertedRelationship.relationshipType = 'one-to-many'; } setOptionsForRelationship(relationshipToConvert, convertedRelationship); + setOptionsForRelationshipDestinationSide(relationshipToConvert, convertedRelationship); const convertedEntityRelationships = convertedRelationships.get(entityName); convertedEntityRelationships.push(convertedRelationship); }); } function setOptionsForRelationship(relationshipToConvert, convertedRelationship) { - relationshipToConvert.forEachOption((optionName, optionValue) => { + if (!convertedRelationship.options) { + convertedRelationship.options = {}; + } + relationshipToConvert.forEachGlobalOption((optionName, optionValue) => { if (optionName === JPA_DERIVED_IDENTIFIER) { if (convertedRelationship.ownerSide) { convertedRelationship.useJPADerivedIdentifier = optionValue; } } else { - if (!convertedRelationship.options) { - convertedRelationship.options = {}; - } convertedRelationship.options[optionName] = optionValue; } }); + if (Object.keys(convertedRelationship.options).length === 0) { + delete convertedRelationship.options; + } +} + +function setOptionsForRelationshipSourceSide(relationshipToConvert, convertedRelationship) { + if (!convertedRelationship.options) { + convertedRelationship.options = {}; + } + relationshipToConvert.forEachDestinationOption((optionName, optionValue) => { + convertedRelationship.options[optionName] = optionValue; + }); + if (Object.keys(convertedRelationship.options).length === 0) { + delete convertedRelationship.options; + } +} + +function setOptionsForRelationshipDestinationSide(relationshipToConvert, convertedRelationship) { + if (!convertedRelationship.options) { + convertedRelationship.options = {}; + } + relationshipToConvert.forEachSourceOption((optionName, optionValue) => { + convertedRelationship.options[optionName] = optionValue; + }); + if (Object.keys(convertedRelationship.options).length === 0) { + delete convertedRelationship.options; + } } /** diff --git a/jdl/converters/json-to-jdl-entity-converter.js b/jdl/converters/json-to-jdl-entity-converter.js index 02abc2905995..ddc5bddba0a6 100644 --- a/jdl/converters/json-to-jdl-entity-converter.js +++ b/jdl/converters/json-to-jdl-entity-converter.js @@ -291,7 +291,11 @@ function getDestinationEntitySideAttributes(isEntityTheDestinationSideEntity, de } function getRelationshipOptions(relationship) { - const options = relationship.options || {}; + const options = relationship.options || { + global: {}, + source: {}, + destination: {}, + }; if (relationship.useJPADerivedIdentifier) { options[JPA_DERIVED_IDENTIFIER] = true; } diff --git a/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.js b/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.js index a3b1e588dd89..8a180e66c131 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.js +++ b/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.js @@ -38,7 +38,6 @@ function convertRelationships(parsedRelationships, annotationToOptionConverter, } const { generateBidirectionalOneToMany } = conversionOptions; return parsedRelationships.map(parsedRelationship => { - const options = annotationToOptionConverter.call(undefined, parsedRelationship.options); const relationshipConfiguration = { from: parsedRelationship.from.name, to: parsedRelationship.to.name, @@ -49,7 +48,11 @@ function convertRelationships(parsedRelationships, annotationToOptionConverter, isInjectedFieldInToRequired: parsedRelationship.to.required, commentInFrom: formatComment(parsedRelationship.from.javadoc), commentInTo: formatComment(parsedRelationship.to.javadoc), - options, + options: { + global: annotationToOptionConverter.call(undefined, parsedRelationship.options.global), + source: annotationToOptionConverter.call(undefined, parsedRelationship.options.source), + destination: annotationToOptionConverter.call(undefined, parsedRelationship.options.destination), + }, generateBidirectionalOneToMany, }; if (!relationshipConfiguration.injectedFieldInFrom && !relationshipConfiguration.injectedFieldInTo) { diff --git a/jdl/models/jdl-relationship.js b/jdl/models/jdl-relationship.js index d8c57fce6ad0..454ac9586d01 100644 --- a/jdl/models/jdl-relationship.js +++ b/jdl/models/jdl-relationship.js @@ -17,13 +17,12 @@ * limitations under the License. */ const logger = require('../utils/objects/logger'); -const merge = require('../utils/object-utils').merge; const RelationshipTypes = require('../jhipster/relationship-types'); const { lowerFirst } = require('../utils/string-utils'); module.exports = class JDLRelationship { constructor(args) { - const merged = merge(defaults(), args); + const merged = mergeDefaultsWithOverrides(args); if (!merged.from || !merged.to) { throw new Error('Source and destination entities must be passed to create a relationship.'); } @@ -66,20 +65,29 @@ module.exports = class JDLRelationship { ); } - hasOption(option) { - return option in this.options; + hasGlobalOption(option) { + return option in this.options.global; } - forEachOption(passedFunction) { - Object.entries(this.options).forEach(([key, value]) => { + forEachGlobalOption(passedFunction) { + Object.entries(this.options.global).forEach(([key, value]) => { passedFunction(key, value); }); } - optionQuantity() { - return Object.keys(this.options).length; + forEachSourceOption(passedFunction) { + Object.entries(this.options.source).forEach(([key, value]) => { + passedFunction(key, value); + }); } + forEachDestinationOption(passedFunction) { + Object.entries(this.options.destination).forEach(([key, value]) => { + passedFunction(key, value); + }); + } + + // TODO: refactor this function toString() { let string = `relationship ${this.type} {\n `; if (this.commentInFrom) { @@ -88,6 +96,14 @@ module.exports = class JDLRelationship { .map(line => ` * ${line}\n`) .join('')} */\n `; } + const sourceOptions = this.options.source; + if (Object.keys(sourceOptions).length !== 0) { + Object.keys(sourceOptions).forEach(name => { + const value = sourceOptions[name]; + string += ` @${name}${value != null && sourceOptions[name] !== true ? `(${value})` : ''}\n`; + }); + string += ' '; + } string += `${this.from}`; if (this.injectedFieldInFrom) { string += `{${this.injectedFieldInFrom}${this.isInjectedFieldInFromRequired ? ' required' : ''}}`; @@ -101,22 +117,47 @@ module.exports = class JDLRelationship { } else { string += ' '; } + const destinationOptions = this.options.destination; + if (Object.keys(destinationOptions).length !== 0) { + string += '\n'; + Object.keys(destinationOptions).forEach(name => { + const value = destinationOptions[name]; + string += ` @${name}${value != null && destinationOptions[name] !== true ? `(${value})` : ''}\n`; + }); + string += ' '; + } string += `${this.to}`; if (this.injectedFieldInTo) { string += `{${this.injectedFieldInTo}${this.isInjectedFieldInToRequired ? ' required' : ''}}`; } - if (Object.keys(this.options).length !== 0) { + const globalOptions = this.options.global; + if (Object.keys(globalOptions).length !== 0) { string += ' with '; - Object.keys(this.options).forEach(name => { + Object.keys(globalOptions).forEach(name => { string += `${name}, `; }); string = string.substring(0, string.length - 2); } string += '\n}'; - return string; + return string.replace(/ \n/g, '\n').replace(/[ ]{4}/g, ' '); } }; +function mergeDefaultsWithOverrides(overrides) { + const defaultOptions = defaults(); + if (!overrides || Object.keys(overrides).length === 0) { + return defaultOptions; + } + const mergedOptions = { + ...defaultOptions, + ...overrides, + }; + mergedOptions.options.global = mergedOptions.options.global || {}; + mergedOptions.options.source = mergedOptions.options.source || {}; + mergedOptions.options.destination = mergedOptions.options.destination || {}; + return mergedOptions; +} + function defaults() { return { type: RelationshipTypes.ONE_TO_ONE, @@ -124,7 +165,11 @@ function defaults() { injectedFieldInTo: null, isInjectedFieldInFromRequired: false, isInjectedFieldInToRequired: false, - options: {}, + options: { + global: {}, + destination: {}, + source: {}, + }, commentInFrom: '', commentInTo: '', generateBidirectionalOneToMany: true, diff --git a/jdl/parsing/jdl-ast-builder-visitor.js b/jdl/parsing/jdl-ast-builder-visitor.js index 9d1c831cdc97..8de88119b047 100644 --- a/jdl/parsing/jdl-ast-builder-visitor.js +++ b/jdl/parsing/jdl-ast-builder-visitor.js @@ -265,20 +265,28 @@ module.exports = class JDLAstBuilderVisitor extends BaseJDLCSTVisitor { } relationshipBody(context) { - const options = []; - if (context.annotationDeclaration) { - context.annotationDeclaration.forEach(contextObject => { - options.push(this.visit(contextObject)); - }); - } + const optionsForTheSourceSide = context.annotationOnSourceSide ? context.annotationOnSourceSide.map(this.visit, this) : []; + const optionsForTheDestinationSide = context.annotationOnDestinationSide + ? context.annotationOnDestinationSide.map(this.visit, this) + : []; + const from = this.visit(context.from); const to = this.visit(context.to); + const relationshipOptions = []; if (context.relationshipOptions) { - this.visit(context.relationshipOptions).forEach(o => options.push(o)); + this.visit(context.relationshipOptions).forEach(option => relationshipOptions.push(option)); } - return { from, to, options }; + return { + from, + to, + options: { + global: relationshipOptions, + source: optionsForTheSourceSide, + destination: optionsForTheDestinationSide, + }, + }; } relationshipSide(context) { diff --git a/jdl/parsing/jdl-parser.js b/jdl/parsing/jdl-parser.js index 9536378fcde9..600f52a3282d 100644 --- a/jdl/parsing/jdl-parser.js +++ b/jdl/parsing/jdl-parser.js @@ -271,11 +271,14 @@ module.exports = class JDLParser extends CstParser { relationshipBody() { this.RULE('relationshipBody', () => { - this.MANY(() => { - this.SUBRULE(this.annotationDeclaration); + this.MANY1(() => { + this.SUBRULE1(this.annotationDeclaration, { LABEL: 'annotationOnSourceSide' }); }); this.SUBRULE1(this.relationshipSide, { LABEL: 'from' }); this.CONSUME(LexerTokens.TO); + this.MANY2(() => { + this.SUBRULE2(this.annotationDeclaration, { LABEL: 'annotationOnDestinationSide' }); + }); this.SUBRULE2(this.relationshipSide, { LABEL: 'to' }); this.OPTION(() => { this.CONSUME(LexerTokens.WITH); diff --git a/jdl/validators/relationship-validator.js b/jdl/validators/relationship-validator.js index 70913cf14344..d4fcc0968ffc 100644 --- a/jdl/validators/relationship-validator.js +++ b/jdl/validators/relationship-validator.js @@ -52,7 +52,7 @@ function checkInjectedFields(jdlRelationship) { } function checkForValidUseOfJPaDerivedIdentifier(jdlRelationship) { - if (jdlRelationship.type !== ONE_TO_ONE && jdlRelationship.hasOption(JPA_DERIVED_IDENTIFIER)) { + if (jdlRelationship.type !== ONE_TO_ONE && jdlRelationship.hasGlobalOption(JPA_DERIVED_IDENTIFIER)) { throw new Error(`Only a ${ONE_TO_ONE} relationship can have the '${JPA_DERIVED_IDENTIFIER}' option.`); } } diff --git a/test/jdl/converters/JDLToJSON/jdl-to-json-relationship-converter.spec.js b/test/jdl/converters/JDLToJSON/jdl-to-json-relationship-converter.spec.js index 936ea64147dc..1afad7b5984c 100644 --- a/test/jdl/converters/JDLToJSON/jdl-to-json-relationship-converter.spec.js +++ b/test/jdl/converters/JDLToJSON/jdl-to-json-relationship-converter.spec.js @@ -159,7 +159,9 @@ describe('JDLToJSONRelationshipConverter', () => { injectedFieldInTo: 'a', injectedFieldInFrom: 'b', options: { - custom: 42, + global: { + custom: 42, + }, }, }); const returned = convert([oneToOneRelationship], ['A', 'B']); @@ -191,7 +193,9 @@ describe('JDLToJSONRelationshipConverter', () => { injectedFieldInTo: 'a', injectedFieldInFrom: 'b', options: { - [JPA_DERIVED_IDENTIFIER]: true, + global: { + [JPA_DERIVED_IDENTIFIER]: true, + }, }, }); const returned = convert([oneToOneRelationship], ['A', 'B']); diff --git a/test/jdl/converters/JDLToJSON/jdl-with-applications-to-json-converter.spec.js b/test/jdl/converters/JDLToJSON/jdl-with-applications-to-json-converter.spec.js index 42b74ad5b1a1..3ee5938802e2 100644 --- a/test/jdl/converters/JDLToJSON/jdl-with-applications-to-json-converter.spec.js +++ b/test/jdl/converters/JDLToJSON/jdl-with-applications-to-json-converter.spec.js @@ -1004,7 +1004,9 @@ describe('JDLWithApplicationsToJSONConverter', () => { injectedFieldInTo: 'a', injectedFieldInFrom: 'b', options: { - custom: 42, + global: { + custom: 42, + }, }, }); jdlObject.addEntity(entityA); @@ -1051,7 +1053,9 @@ describe('JDLWithApplicationsToJSONConverter', () => { injectedFieldInTo: 'a', injectedFieldInFrom: 'b', options: { - [JPA_DERIVED_IDENTIFIER]: true, + global: { + [JPA_DERIVED_IDENTIFIER]: true, + }, }, }); jdlObject.addEntity(entityA); diff --git a/test/jdl/converters/JDLToJSON/jdl-without-application-to-json-converter.spec.js b/test/jdl/converters/JDLToJSON/jdl-without-application-to-json-converter.spec.js index 9da718850c7f..545a4e01b378 100644 --- a/test/jdl/converters/JDLToJSON/jdl-without-application-to-json-converter.spec.js +++ b/test/jdl/converters/JDLToJSON/jdl-without-application-to-json-converter.spec.js @@ -982,7 +982,9 @@ describe('JDLWithoutApplicationToJSONConverter', () => { injectedFieldInTo: 'a', injectedFieldInFrom: 'b', options: { - custom: 42, + global: { + custom: 42, + }, }, }); jdlObject.addEntity(entityA); @@ -1025,7 +1027,9 @@ describe('JDLWithoutApplicationToJSONConverter', () => { injectedFieldInTo: 'a', injectedFieldInFrom: 'b', options: { - [JPA_DERIVED_IDENTIFIER]: true, + global: { + [JPA_DERIVED_IDENTIFIER]: true, + }, }, }); jdlObject.addEntity(entityA); diff --git a/test/jdl/converters/parsedJDLToJDLObject/parsed-jdl-to-jdl-object-converter.spec.js b/test/jdl/converters/parsedJDLToJDLObject/parsed-jdl-to-jdl-object-converter.spec.js index 8517fde15cff..1185796fa594 100644 --- a/test/jdl/converters/parsedJDLToJDLObject/parsed-jdl-to-jdl-object-converter.spec.js +++ b/test/jdl/converters/parsedJDLToJDLObject/parsed-jdl-to-jdl-object-converter.spec.js @@ -708,7 +708,8 @@ describe('ParsedJDLToJDLObjectConverter', () => { let customBinaryOption; let customBinaryOption2; let fieldAnnotation; - let relationshipAnnotation; + let relationshipAnnotationOnSource; + let relationshipAnnotationOnDestination; before(() => { const input = JDLReader.parseFromFiles([path.join(__dirname, '..', '..', 'test-files', 'annotations.jdl')]); @@ -725,7 +726,9 @@ describe('ParsedJDLToJDLObjectConverter', () => { customBinaryOption = jdlObject.getOptionsForName('myCustomBinaryOption')[0]; customBinaryOption2 = jdlObject.getOptionsForName('myCustomBinaryOption')[1]; fieldAnnotation = jdlObject.entities.A.fields.name.options.id; - relationshipAnnotation = jdlObject.relationships.getOneToMany('OneToMany_A{b}_B{a}').options.id; + relationshipAnnotationOnSource = jdlObject.relationships.getOneToMany('OneToMany_A{b}_B{a}').options.source; + relationshipAnnotationOnDestination = jdlObject.relationships.getOneToMany('OneToMany_A{b}_B{a}').options + .destination; }); it('should set the annotations as options', () => { @@ -740,7 +743,12 @@ describe('ParsedJDLToJDLObjectConverter', () => { expect(customBinaryOption.value).to.deep.equal('customValue'); expect(customBinaryOption2.value).to.deep.equal('customValue2'); expect(fieldAnnotation).to.deep.equal(true); - expect(relationshipAnnotation).to.deep.equal(true); + expect(relationshipAnnotationOnSource).to.deep.equal({ + annotationOnSource: 'toto', + }); + expect(relationshipAnnotationOnDestination).to.deep.equal({ + annotationOnDestination: true, + }); }); }); context('that are capitalized', () => { @@ -753,7 +761,8 @@ describe('ParsedJDLToJDLObjectConverter', () => { let customBinaryOption; let customBinaryOption2; let fieldAnnotation; - let relationshipAnnotation; + let relationshipAnnotationOnSource; + let relationshipAnnotationOnDestination; before(() => { const input = JDLReader.parseFromFiles([ @@ -772,7 +781,9 @@ describe('ParsedJDLToJDLObjectConverter', () => { customBinaryOption = jdlObject.getOptionsForName('myCustomBinaryOption')[0]; customBinaryOption2 = jdlObject.getOptionsForName('myCustomBinaryOption')[1]; fieldAnnotation = jdlObject.entities.A.fields.name.options.id; - relationshipAnnotation = jdlObject.relationships.getOneToMany('OneToMany_A{b}_B{a}').options.id; + relationshipAnnotationOnSource = jdlObject.relationships.getOneToMany('OneToMany_A{b}_B{a}').options.source; + relationshipAnnotationOnDestination = jdlObject.relationships.getOneToMany('OneToMany_A{b}_B{a}').options + .destination; }); it('should set the annotations as options with lower-case letters first', () => { @@ -787,7 +798,12 @@ describe('ParsedJDLToJDLObjectConverter', () => { expect(customBinaryOption.value).to.deep.equal('customValue'); expect(customBinaryOption2.value).to.deep.equal('customValue2'); expect(fieldAnnotation).to.deep.equal(true); - expect(relationshipAnnotation).to.deep.equal(true); + expect(relationshipAnnotationOnSource).to.deep.equal({ + annotationOnSource: true, + }); + expect(relationshipAnnotationOnDestination).to.deep.equal({ + annotationOnDestination: true, + }); }); }); }); @@ -891,7 +907,9 @@ describe('ParsedJDLToJDLObjectConverter', () => { }); it('should set it', () => { - expect(jdlObject.relationships.getOneToOne('OneToOne_A{b}_B').options.jpaDerivedIdentifier).to.be.true; + expect(jdlObject.relationships.getOneToOne('OneToOne_A{b}_B').options.global).to.deep.equal({ + jpaDerivedIdentifier: true, + }); }); }); context('when parsing entity options in applications', () => { diff --git a/test/jdl/converters/parsedJDLToJDLObject/relationship-converter.spec.js b/test/jdl/converters/parsedJDLToJDLObject/relationship-converter.spec.js index e21559d41201..7a632193f652 100644 --- a/test/jdl/converters/parsedJDLToJDLObject/relationship-converter.spec.js +++ b/test/jdl/converters/parsedJDLToJDLObject/relationship-converter.spec.js @@ -50,10 +50,19 @@ describe('RelationshipConverter', () => { javadoc: '/**\n * Not required\n */', }, cardinality: 'one-to-many', - options: [{ option: 'dto', method: 'mapstruct' }], + options: { + global: [{ optionName: 'jpaDerivedIdentifier', type: 'UNARY' }], + source: [], + destination: [], + }, }, ], - () => ({ dto: 'mapstruct' }) + options => { + if (options.length !== 0) { + return { jpaDerivedIdentifier: true }; + } + return {}; + } ); expectedRelationships = [ new JDLRelationship({ @@ -66,7 +75,13 @@ describe('RelationshipConverter', () => { isInjectedFieldInToRequired: false, commentInFrom: '/**\\nRequired\\n/', commentInTo: '/**\\nNot required\\n/', - options: { dto: 'mapstruct' }, + options: { + global: { + jpaDerivedIdentifier: true, + }, + destination: {}, + source: {}, + }, }), ]; }); @@ -94,10 +109,19 @@ describe('RelationshipConverter', () => { javadoc: '/**\n * Not required\n */', }, cardinality: 'one-to-many', - options: [{ option: 'dto', method: 'mapstruct' }], + options: { + global: [{ optionName: 'jpaDerivedIdentifier', type: 'UNARY' }], + source: [], + destination: [], + }, }, ], - () => ({ dto: 'mapstruct' }) + options => { + if (options.length !== 0) { + return { jpaDerivedIdentifier: true }; + } + return {}; + } ); expectedRelationships = [ new JDLRelationship({ @@ -110,7 +134,13 @@ describe('RelationshipConverter', () => { isInjectedFieldInToRequired: false, commentInFrom: '/**\\nRequired\\n/', commentInTo: '/**\\nNot required\\n/', - options: { dto: 'mapstruct' }, + options: { + global: { + jpaDerivedIdentifier: true, + }, + destination: {}, + source: {}, + }, }), ]; }); diff --git a/test/jdl/grammar/grammar.spec.js b/test/jdl/grammar/grammar.spec.js index fc193b1f0031..019629e8f6b4 100644 --- a/test/jdl/grammar/grammar.spec.js +++ b/test/jdl/grammar/grammar.spec.js @@ -1156,7 +1156,11 @@ entity A { it('should parse them', () => { expect(relationship).to.deep.equal({ - options: [], + options: { + global: [], + destination: [], + source: [], + }, cardinality: 'OneToOne', from: { injectedField: null, @@ -1321,12 +1325,16 @@ entity A { }); it('should add it', () => { - expect(relationship.options).to.deep.equal([ - { - optionName: 'jpaDerivedIdentifier', - type: 'UNARY', - }, - ]); + expect(relationship.options).to.deep.equal({ + global: [ + { + optionName: 'jpaDerivedIdentifier', + type: 'UNARY', + }, + ], + source: [], + destination: [], + }); }); }); context('when parsing more than one relationship', () => { @@ -1352,12 +1360,16 @@ entity A { javadoc: null, name: 'A', }, - options: [ - { - optionName: 'jpaDerivedIdentifier', - type: 'UNARY', - }, - ], + options: { + global: [ + { + optionName: 'jpaDerivedIdentifier', + type: 'UNARY', + }, + ], + destination: [], + source: [], + }, to: { injectedField: null, javadoc: null, @@ -1371,7 +1383,11 @@ entity A { javadoc: null, name: 'B', }, - options: [], + options: { + global: [], + destination: [], + source: [], + }, to: { injectedField: null, javadoc: null, @@ -1385,12 +1401,16 @@ entity A { javadoc: null, name: 'D', }, - options: [ - { - optionName: 'jpaDerivedIdentifier', - type: 'UNARY', - }, - ], + options: { + global: [ + { + optionName: 'jpaDerivedIdentifier', + type: 'UNARY', + }, + ], + destination: [], + source: [], + }, to: { injectedField: null, javadoc: null, @@ -1401,6 +1421,121 @@ entity A { }); }); }); + context('with annotations', () => { + context('only in the source side', () => { + let relationships; + + before(() => { + const content = parseFromContent('relationship OneToOne { @id A to B }'); + relationships = content.relationships; + }); + + it('should parse them', () => { + expect(relationships).to.deep.equal([ + { + cardinality: 'OneToOne', + from: { + injectedField: null, + javadoc: null, + name: 'A', + }, + options: { + global: [], + destination: [], + source: [ + { + optionName: 'id', + type: 'UNARY', + }, + ], + }, + to: { + injectedField: null, + javadoc: null, + name: 'B', + }, + }, + ]); + }); + }); + context('only in the destination side', () => { + let relationships; + + before(() => { + const content = parseFromContent('relationship OneToOne { A to @id B }'); + relationships = content.relationships; + }); + + it('should parse them', () => { + expect(relationships).to.deep.equal([ + { + cardinality: 'OneToOne', + from: { + injectedField: null, + javadoc: null, + name: 'A', + }, + options: { + global: [], + destination: [ + { + optionName: 'id', + type: 'UNARY', + }, + ], + source: [], + }, + to: { + injectedField: null, + javadoc: null, + name: 'B', + }, + }, + ]); + }); + }); + context('in both sides', () => { + let relationships; + + before(() => { + const content = parseFromContent('relationship OneToOne { @id A to @id B }'); + relationships = content.relationships; + }); + + it('should parse them', () => { + expect(relationships).to.deep.equal([ + { + cardinality: 'OneToOne', + from: { + injectedField: null, + javadoc: null, + name: 'A', + }, + options: { + global: [], + destination: [ + { + optionName: 'id', + type: 'UNARY', + }, + ], + source: [ + { + optionName: 'id', + type: 'UNARY', + }, + ], + }, + to: { + injectedField: null, + javadoc: null, + name: 'B', + }, + }, + ]); + }); + }); + }); }); context('when parsing an option', () => { context('being unary', () => { diff --git a/test/jdl/jdl-importer.spec.js b/test/jdl/jdl-importer.spec.js index f4d4ea2b4b6a..ea6581ac9148 100644 --- a/test/jdl/jdl-importer.spec.js +++ b/test/jdl/jdl-importer.spec.js @@ -2016,5 +2016,49 @@ entity A ); }); }); + context('when parsing relationships with annotations and options', () => { + let relationshipOnSource; + let relationshipOnDestination; + + before(() => { + const content = `entity A +entity B + +relationship OneToOne { + @id A{b} to @NotId(value) @Something B{a} with jpaDerivedIdentifier +} +`; + const importer = createImporterFromContent(content, { databaseType: 'postgresql', applicationName: 'toto' }); + const imported = importer.import(); + relationshipOnSource = imported.exportedEntities[0].relationships[0]; + relationshipOnDestination = imported.exportedEntities[1].relationships[0]; + }); + + after(() => { + fse.removeSync('.jhipster'); + }); + + it('should export them', () => { + expect(relationshipOnSource).to.deep.equal({ + options: { notId: 'value', something: true }, + otherEntityField: 'id', + otherEntityName: 'b', + otherEntityRelationshipName: 'a', + ownerSide: true, + relationshipName: 'b', + relationshipType: 'one-to-one', + useJPADerivedIdentifier: true, + }); + expect(relationshipOnDestination).to.deep.equal({ + options: { id: true }, + otherEntityField: 'id', + otherEntityName: 'a', + otherEntityRelationshipName: 'b', + ownerSide: false, + relationshipName: 'a', + relationshipType: 'one-to-one', + }); + }); + }); }); }); diff --git a/test/jdl/models/jdl-relationship.spec.js b/test/jdl/models/jdl-relationship.spec.js index 9b14ff23f7de..ee89593c0700 100644 --- a/test/jdl/models/jdl-relationship.spec.js +++ b/test/jdl/models/jdl-relationship.spec.js @@ -106,7 +106,7 @@ describe('JDLRelationship', () => { ); }); }); - describe('hasOption', () => { + describe('hasGlobalOption', () => { let relationship; before(() => { @@ -115,27 +115,31 @@ describe('JDLRelationship', () => { to: 'B', injectedFieldInTo: 'a', type: RelationshipTypes.ONE_TO_ONE, - options: { [JPA_DERIVED_IDENTIFIER]: true }, + options: { + global: { [JPA_DERIVED_IDENTIFIER]: true }, + destination: {}, + source: {}, + }, }); }); context('when the option does not exist', () => { it('should return false', () => { - expect(relationship.hasOption('toto')).to.be.false; + expect(relationship.hasGlobalOption('toto')).to.be.false; }); }); context('when the option exists', () => { it('should return true', () => { - expect(relationship.hasOption(JPA_DERIVED_IDENTIFIER)).to.be.true; + expect(relationship.hasGlobalOption(JPA_DERIVED_IDENTIFIER)).to.be.true; }); }); }); - describe('forEachOption', () => { + describe('forEachGlobalOption', () => { let relationship; let options; before(() => { - options = { custom: 1, anotherCustom: 42 }; + options = { global: { custom: 1, anotherCustom: 42 } }; relationship = new JDLRelationship({ from: 'A', to: 'B', @@ -146,8 +150,8 @@ describe('JDLRelationship', () => { }); it('should loop over the function for each element', () => { - relationship.forEachOption((optionName, optionValue) => { - expect(optionValue).to.equal(options[optionName]); + relationship.forEachGlobalOption((optionName, optionValue) => { + expect(optionValue).to.equal(options.global[optionName]); }); }); }); @@ -292,26 +296,62 @@ describe('JDLRelationship', () => { }); }); context('with options', () => { - let relationship; + context('being global', () => { + let relationship; - before(() => { - relationship = new JDLRelationship({ - from: 'A', - to: 'B', - type: RelationshipTypes.ONE_TO_ONE, - injectedFieldInFrom: 'b', - injectedFieldInTo: 'a', - options: { [JPA_DERIVED_IDENTIFIER]: true }, + before(() => { + relationship = new JDLRelationship({ + from: 'A', + to: 'B', + type: RelationshipTypes.ONE_TO_ONE, + injectedFieldInFrom: 'b', + injectedFieldInTo: 'a', + options: { + global: { [JPA_DERIVED_IDENTIFIER]: true }, + source: {}, + destination: {}, + }, + }); }); - }); - it('should add them', () => { - expect(relationship.toString()).to.equal( - `relationship ${relationship.type} { + it('should add them', () => { + expect(relationship.toString()).to.equal( + `relationship ${relationship.type} { ${relationship.from}{${relationship.injectedFieldInFrom}} to ${relationship.to}{` + - `${relationship.injectedFieldInTo}} with ${JPA_DERIVED_IDENTIFIER} + `${relationship.injectedFieldInTo}} with ${JPA_DERIVED_IDENTIFIER} }` - ); + ); + }); + }); + context('being global, on the source and on the destination', () => { + let relationship; + + before(() => { + relationship = new JDLRelationship({ + from: 'A', + to: 'B', + type: RelationshipTypes.ONE_TO_ONE, + injectedFieldInFrom: 'b', + injectedFieldInTo: 'a', + options: { + global: { [JPA_DERIVED_IDENTIFIER]: true }, + source: { id: true }, + destination: { id: true, idGenerator: 'sequence' }, + }, + }); + }); + + it('should add them', () => { + expect(relationship.toString()).to.equal( + `relationship ${relationship.type} { + @id + ${relationship.from}{${relationship.injectedFieldInFrom}} to + @id + @idGenerator(sequence) + ${relationship.to}{${relationship.injectedFieldInTo}} with ${JPA_DERIVED_IDENTIFIER} +}` + ); + }); }); }); }); diff --git a/test/jdl/test-files/annotations.jdl b/test/jdl/test-files/annotations.jdl index 60df66742d3d..f7dccfd01925 100644 --- a/test/jdl/test-files/annotations.jdl +++ b/test/jdl/test-files/annotations.jdl @@ -22,5 +22,5 @@ entity B entity C relationship OneToMany { - @id A{b required} to B{a} + @annotationOnSource(toto) A{b required} to @annotationOnDestination B{a} } diff --git a/test/jdl/test-files/capitalized_annotations.jdl b/test/jdl/test-files/capitalized_annotations.jdl index ba09d074fb2b..ee982a07eaec 100644 --- a/test/jdl/test-files/capitalized_annotations.jdl +++ b/test/jdl/test-files/capitalized_annotations.jdl @@ -22,5 +22,5 @@ entity B entity C relationship OneToMany { - @Id A{b required} to B{a} + @annotationOnSource A{b required} to @annotationOnDestination B{a} } diff --git a/test/jdl/validators/relationship-validator.spec.js b/test/jdl/validators/relationship-validator.spec.js index 576866daf998..eb888331d4f9 100644 --- a/test/jdl/validators/relationship-validator.spec.js +++ b/test/jdl/validators/relationship-validator.spec.js @@ -115,7 +115,11 @@ describe('RelationshipValidator', () => { to: 'B', type, injectedFieldInTo: 'a', - options: { [JPA_DERIVED_IDENTIFIER]: true }, + options: { + global: { + [JPA_DERIVED_IDENTIFIER]: true, + }, + }, }); }); From 35255feb5dcd6f9b3ed96474feb7134c51f7a7a1 Mon Sep 17 00:00:00 2001 From: Vishal Mahajan Date: Mon, 30 Nov 2020 00:08:41 +0530 Subject: [PATCH 0046/1179] Replace webpack: usage with webapp: in server code/ci --- generators/ci-cd/templates/.gitlab-ci.yml.ejs | 20 +++++++++---------- .../ci-cd/templates/jenkins/Jenkinsfile.ejs | 6 +++--- generators/client/index.js | 4 ++-- .../client/templates/angular/package.json.ejs | 5 ++++- .../main/webapp/content/scss/vendor.scss.ejs | 2 +- .../angular/src/main/webapp/index.html.ejs | 4 ++-- .../client/templates/react/package.json.ejs | 5 ++++- .../react/src/main/webapp/index.html.ejs | 4 ++-- .../client/templates/vue/package.json.ejs | 5 ++++- .../main/webapp/content/css/vendor.css.ejs | 2 +- .../main/webapp/content/scss/vendor.scss.ejs | 2 +- .../vue/src/main/webapp/index.html.ejs | 4 ++-- generators/common/templates/README.md.ejs | 2 +- generators/generator-base-private.js | 4 ++-- generators/server/index.js | 16 +++++++-------- .../templates/gradle/profile_dev.gradle.ejs | 6 +++--- .../templates/gradle/profile_prod.gradle.ejs | 12 +++++------ generators/server/templates/pom.xml.ejs | 14 ++++++------- test-integration/scripts/21-tests-backend.sh | 4 ++-- 19 files changed, 65 insertions(+), 56 deletions(-) diff --git a/generators/ci-cd/templates/.gitlab-ci.yml.ejs b/generators/ci-cd/templates/.gitlab-ci.yml.ejs index 4465c0f54f67..bc309ba90469 100644 --- a/generators/ci-cd/templates/.gitlab-ci.yml.ejs +++ b/generators/ci-cd/templates/.gitlab-ci.yml.ejs @@ -186,7 +186,7 @@ nohttp: maven-compile: stage: build script: - - ./mvnw -ntp compile -P-webpack -Dmaven.repo.local=$MAVEN_USER_HOME + - ./mvnw -ntp compile -P-webapp -Dmaven.repo.local=$MAVEN_USER_HOME artifacts: paths: - target/classes/ @@ -210,7 +210,7 @@ maven-test: stage: test script: - - ./mvnw -ntp verify -P-webpack -Dmaven.repo.local=$MAVEN_USER_HOME <% if (insideDocker && databaseType === 'sql') { %>-Dspring.profiles.active=testcontainers<% } %> + - ./mvnw -ntp verify -P-webapp -Dmaven.repo.local=$MAVEN_USER_HOME <% if (insideDocker && databaseType === 'sql') { %>-Dspring.profiles.active=testcontainers<% } %> artifacts: reports: junit: target/test-results/**/TEST-*.xml @@ -292,20 +292,20 @@ stages: - analyze <%_ } _%> - packaging -webpack-build: +webapp-build: stage: build script: - <%= clientPackageManager %> install - - <%= clientPackageManager %> run ci:webpack:build + - <%= clientPackageManager %> run webapp:build artifacts: paths: - build/ -webpack-test: +webapp-test: stage: test dependencies: - - webpack-build + - webapp-build script: - - <%= clientPackageManager %> run webpack:test + - <%= clientPackageManager %> run webapp:test artifacts: reports: junit: build/test-results/TESTS-results-jest.xml @@ -316,7 +316,7 @@ webpack-test: sonar-analyze: stage: analyze dependencies: - - webpack-test + - webapp-test script: - npm run sonar artifacts: @@ -324,10 +324,10 @@ sonar-analyze: - build/ - build/test-results <%_ } _%> -webpack-prod: +webapp-prod: stage: packaging script: - - <%= clientPackageManager %> run webpack:prod + - <%= clientPackageManager %> run webapp:prod # - add cmd to zip the app folder build/resources/main/static artifacts: paths: diff --git a/generators/ci-cd/templates/jenkins/Jenkinsfile.ejs b/generators/ci-cd/templates/jenkins/Jenkinsfile.ejs index 5d3a2a6f9028..47d3ed1e8863 100644 --- a/generators/ci-cd/templates/jenkins/Jenkinsfile.ejs +++ b/generators/ci-cd/templates/jenkins/Jenkinsfile.ejs @@ -36,7 +36,7 @@ node { <%_ if (buildTool === 'maven') { _%> <%= indent %> stage('clean') { <%= indent %> sh "chmod +x mvnw" -<%= indent %> sh "./mvnw -ntp clean -P-webpack" +<%= indent %> sh "./mvnw -ntp clean -P-webapp" <%= indent %> } <%= indent %> stage('nohttp') { <%= indent %> sh "./mvnw -ntp checkstyle:check" @@ -54,7 +54,7 @@ node { <%_ } _%> <%= indent %> stage('backend tests') { <%= indent %> try { -<%= indent %> sh "./mvnw -ntp verify -P-webpack" +<%= indent %> sh "./mvnw -ntp verify -P-webapp" <%= indent %> } catch(err) { <%= indent %> throw err <%= indent %> } finally { @@ -84,7 +84,7 @@ node { <%= indent %> sh "./mvnw -ntp com.heroku.sdk:heroku-maven-plugin:2.0.5:deploy -DskipTests -Pprod -Dheroku.buildpacks=heroku/jvm -Dheroku.appName=<%= herokuAppName %>" <%_ } else { _%> <%= indent %> stage('packaging') { -<%= indent %> sh "./mvnw -ntp verify -P-webpack <% if (cicdIntegrations.includes('deploy')) { %>deploy <% } %>-Pprod -DskipTests" +<%= indent %> sh "./mvnw -ntp verify -P-webapp <% if (cicdIntegrations.includes('deploy')) { %>deploy <% } %>-Pprod -DskipTests" <%_ } _%> <%= indent %> archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true <%= indent %> } diff --git a/generators/client/index.js b/generators/client/index.js index 4a7daeef8843..861197e9a3a3 100644 --- a/generators/client/index.js +++ b/generators/client/index.js @@ -327,10 +327,10 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator { if (this.clientFramework === 'react') { scriptsStorage.set( 'ci:frontend:test', - 'npm run webpack:build:$npm_package_config_default_environment && npm run test-ci' + 'npm run webapp:build:$npm_package_config_default_environment && npm run test-ci' ); } else { - scriptsStorage.set('ci:frontend:build', 'npm run webpack:build:$npm_package_config_default_environment'); + scriptsStorage.set('ci:frontend:build', 'npm run webapp:build:$npm_package_config_default_environment'); scriptsStorage.set('ci:frontend:test', 'npm run ci:frontend:build && npm test'); } diff --git a/generators/client/templates/angular/package.json.ejs b/generators/client/templates/angular/package.json.ejs index 2885b2249d2a..3d63426ba433 100644 --- a/generators/client/templates/angular/package.json.ejs +++ b/generators/client/templates/angular/package.json.ejs @@ -179,7 +179,10 @@ limitations under the License. "webpack:dev": "ng serve", "webpack:dev-verbose": "ng serve --verbose", "webpack:prod": "<%= clientPackageManager %> run cleanup && <%= clientPackageManager %> run webpack:build:prod && <%= clientPackageManager %> run clean-www", - "webpack:test": "<%= clientPackageManager %> run test" + "webpack:test": "<%= clientPackageManager %> run test", + "webapp:test": "<%= clientPackageManager %> run webpack:test", + "webapp:build": "<%= clientPackageManager %> run webpack:build", + "webapp:prod": "<%= clientPackageManager %> run webpack:prod" }, "jestSonar": { "reportPath": "<%= BUILD_DIR %>test-results/jest", diff --git a/generators/client/templates/angular/src/main/webapp/content/scss/vendor.scss.ejs b/generators/client/templates/angular/src/main/webapp/content/scss/vendor.scss.ejs index aafa83d14981..83eaa99bd300 100644 --- a/generators/client/templates/angular/src/main/webapp/content/scss/vendor.scss.ejs +++ b/generators/client/templates/angular/src/main/webapp/content/scss/vendor.scss.ejs @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. -%> -/* after changing this file run '<%= clientPackageManager %> run webpack:build' */ +/* after changing this file run '<%= clientPackageManager %> run webapp:build' */ /*************************** put Sass variables here: diff --git a/generators/client/templates/angular/src/main/webapp/index.html.ejs b/generators/client/templates/angular/src/main/webapp/index.html.ejs index 2cab1f5a6651..dc774995fc6d 100644 --- a/generators/client/templates/angular/src/main/webapp/index.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/index.html.ejs @@ -50,7 +50,7 @@

An error has occurred :-(

Usual error causes

    -
  1. You started the application from an IDE and you didn't run <%= clientPackageManager %> start or <%= clientPackageManager %> run webpack:build.
    2. +
  2. You started the application from an IDE and you didn't run <%= clientPackageManager %> start or <%= clientPackageManager %> run webapp:build.
  3. You had a network error while running <%= clientPackageManager %> install. If you are behind a corporate proxy, it is likely that this error was caused by your proxy. Have a look at the JHipster error logs, you will probably have the cause of the error.
  4. You installed a Node.js version that doesn't work with JHipster: please use an LTS (long-term support) version, as it's the only version we support.
@@ -59,7 +59,7 @@

If you want to have more control, so you can debug your issue more easily, you should follow the following steps:

  1. Install npm dependencies with the command <%= clientPackageManager %> install
    2. -
  2. Build the client with the command <%= clientPackageManager %> run webpack:build or <%= clientPackageManager %> start
    3. +
  3. Build the client with the command <%= clientPackageManager %> run webapp:build or <%= clientPackageManager %> start
  4. Start the server with <% if (buildTool === 'maven') { %>./mvnw<% } else if (buildTool === 'gradle') { %>./gradlew<% } %> or using your IDE
diff --git a/generators/client/templates/react/package.json.ejs b/generators/client/templates/react/package.json.ejs index a4173aa20221..8f749e1cf150 100644 --- a/generators/client/templates/react/package.json.ejs +++ b/generators/client/templates/react/package.json.ejs @@ -226,7 +226,10 @@ limitations under the License. "webpack:prod": "<%= clientPackageManager %> run cleanup && <%= clientPackageManager %> run webpack:build:prod", "webpack:test": "<%= clientPackageManager %> run test", "webpack-dev-server": "node --max_old_space_size=4096 node_modules/webpack-dev-server/bin/webpack-dev-server.js", - "webpack": "node --max_old_space_size=4096 node_modules/webpack/bin/webpack.js" + "webpack": "node --max_old_space_size=4096 node_modules/webpack/bin/webpack.js", + "webapp:test": "<%= clientPackageManager %> run webpack:test", + "webapp:build": "<%= clientPackageManager %> run webpack:build", + "webapp:prod": "<%= clientPackageManager %> run webpack:prod" }, "jestSonar": { "reportPath": "<%= BUILD_DIR %>test-results/jest", diff --git a/generators/client/templates/react/src/main/webapp/index.html.ejs b/generators/client/templates/react/src/main/webapp/index.html.ejs index 8146360018b4..de39e5cd601c 100644 --- a/generators/client/templates/react/src/main/webapp/index.html.ejs +++ b/generators/client/templates/react/src/main/webapp/index.html.ejs @@ -50,7 +50,7 @@

An error has occurred :-(

Usual error causes

    -
  1. You started the application from an IDE and you didn't run <%= clientPackageManager %> start or <%= clientPackageManager %> run webpack:build.
    2. +
  2. You started the application from an IDE and you didn't run <%= clientPackageManager %> start or <%= clientPackageManager %> run webapp:build.
  3. You had a network error while running <%= clientPackageManager %> install. If you are behind a corporate proxy, it is likely that this error was caused by your proxy. Have a look at the JHipster error logs, you will probably have the cause of the error.
  4. You installed a Node.js version that doesn't work with JHipster: please use an LTS (long-term support) version, as it's the only version we support.
@@ -59,7 +59,7 @@

If you want to have more control, so you can debug your issue more easily, you should follow the following steps:

  1. Install npm dependencies with the command <%= clientPackageManager %> install
    2. -
  2. Build the client with the command <%= clientPackageManager %> run webpack:build or <%= clientPackageManager %> start
    3. +
  3. Build the client with the command <%= clientPackageManager %> run webapp:build or <%= clientPackageManager %> start
  4. Start the server with <% if (buildTool === 'maven') { %>./mvnw<% } else if (buildTool === 'gradle') { %>./gradlew<% } %> or using your IDE
diff --git a/generators/client/templates/vue/package.json.ejs b/generators/client/templates/vue/package.json.ejs index c9fc08b147d0..3c740e123b0c 100644 --- a/generators/client/templates/vue/package.json.ejs +++ b/generators/client/templates/vue/package.json.ejs @@ -210,7 +210,10 @@ limitations under the License. "webpack:prod": "<%= clientPackageManager %> run cleanup && <%= clientPackageManager %> run webpack:build:prod && <%= clientPackageManager %> run clean-www", "webpack:test": "<%= clientPackageManager %> run test", "webpack-dev-server": "node --max_old_space_size=4096 node_modules/webpack-dev-server/bin/webpack-dev-server.js", - "webpack": "node --max_old_space_size=4096 node_modules/webpack/bin/webpack.js" + "webpack": "node --max_old_space_size=4096 node_modules/webpack/bin/webpack.js", + "webapp:test": "<%= clientPackageManager %> run webpack:test", + "webapp:build": "<%= clientPackageManager %> run webpack:build", + "webapp:prod": "<%= clientPackageManager %> run webpack:prod" }, "jestSonar": { "reportPath": "<%= BUILD_DIR %>test-results/jest", diff --git a/generators/client/templates/vue/src/main/webapp/content/css/vendor.css.ejs b/generators/client/templates/vue/src/main/webapp/content/css/vendor.css.ejs index 5717f8786035..1def43414083 100644 --- a/generators/client/templates/vue/src/main/webapp/content/css/vendor.css.ejs +++ b/generators/client/templates/vue/src/main/webapp/content/css/vendor.css.ejs @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. -%> -/* after changing this file run '<%= clientPackageManager %> run webpack:build' */ +/* after changing this file run '<%= clientPackageManager %> run webapp:build' */ @import 'bootstrap/dist/css/bootstrap.min.css'; @import 'bootstrap-vue/dist/bootstrap-vue.css <%_ if (enableI18nRTL) { _%> diff --git a/generators/client/templates/vue/src/main/webapp/content/scss/vendor.scss.ejs b/generators/client/templates/vue/src/main/webapp/content/scss/vendor.scss.ejs index 4776f85c0cf6..ba48b180af02 100644 --- a/generators/client/templates/vue/src/main/webapp/content/scss/vendor.scss.ejs +++ b/generators/client/templates/vue/src/main/webapp/content/scss/vendor.scss.ejs @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. -%> -/* after changing this file run '<%= clientPackageManager %> run webpack:build' */ +/* after changing this file run '<%= clientPackageManager %> run webapp:build' */ /*************************** put Sass variables here: diff --git a/generators/client/templates/vue/src/main/webapp/index.html.ejs b/generators/client/templates/vue/src/main/webapp/index.html.ejs index 1600cfb6b264..ab2038878b18 100644 --- a/generators/client/templates/vue/src/main/webapp/index.html.ejs +++ b/generators/client/templates/vue/src/main/webapp/index.html.ejs @@ -32,7 +32,7 @@
  1. You started the application from an IDE and you didn't run npm start or - npm run webpack:build.
    2. + npm run webapp:build.
  2. You had a network error while running npm install. If you are behind a corporate proxy, it is likely that this error was caused by your proxy. Have a look at the JHipster @@ -49,7 +49,7 @@ steps:

    1. Install npm dependencies with the command npm install
      2. -
    2. Build the client with the command npm run webpack:build or Build the client with the command npm run webapp:build or npm start
    3. Start the server with ./mvnw or using your IDE
    diff --git a/generators/common/templates/README.md.ejs b/generators/common/templates/README.md.ejs index 199f6d3ea605..4b3f64a987a1 100644 --- a/generators/common/templates/README.md.ejs +++ b/generators/common/templates/README.md.ejs @@ -91,7 +91,7 @@ auto-refreshes when files change on your hard drive. ./mvnw <%_ } _%> <%_ if (buildTool === 'gradle') { _%> -./gradlew -x webpack +./gradlew -x webapp <%_ } _%> <%= clientPackageManager %> start ``` diff --git a/generators/generator-base-private.js b/generators/generator-base-private.js index ff4abd092109..e9f5f80d5cfe 100644 --- a/generators/generator-base-private.js +++ b/generators/generator-base-private.js @@ -1192,8 +1192,8 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator { */ rebuildClient() { const done = this.async(); - this.log(`\n${chalk.bold.green('Running `webpack:build` to update client app\n')}`); - this.spawnCommand(this.clientPackageManager, ['run', 'webpack:build']).on('close', () => { + this.log(`\n${chalk.bold.green('Running `webapp:build` to update client app\n')}`); + this.spawnCommand(this.clientPackageManager, ['run', 'webapp:build']).on('close', () => { done(); }); } diff --git a/generators/server/index.js b/generators/server/index.js index 7fd934c9165b..379d9b262613 100644 --- a/generators/server/index.js +++ b/generators/server/index.js @@ -441,29 +441,29 @@ module.exports = class JHipsterServerGenerator extends BaseBlueprintGenerator { 'java:jar': './mvnw -ntp verify -DskipTests --batch-mode', 'java:war': './mvnw -ntp verify -DskipTests --batch-mode -Pwar', 'java:docker': './mvnw -ntp verify -DskipTests jib:dockerBuild', - 'backend:unit:test': `./mvnw -ntp -P-webpack verify --batch-mode ${javaCommonLog} ${javaTestLog}`, + 'backend:unit:test': `./mvnw -ntp -P-webapp verify --batch-mode ${javaCommonLog} ${javaTestLog}`, }); } else if (buildTool === 'gradle') { - const excludeWebpack = this.jhipsterConfig.skipClient ? '' : '-x webpack'; + const excludeWebapp = this.jhipsterConfig.skipClient ? '' : '-x webapp'; e2ePackage = 'e2e'; scriptsStorage.set({ 'backend:info': './gradlew -v', - 'backend:doc:test': `./gradlew javadoc ${excludeWebpack}`, - 'backend:nohttp:test': `./gradlew checkstyleNohttp ${excludeWebpack}`, + 'backend:doc:test': `./gradlew javadoc ${excludeWebapp}`, + 'backend:nohttp:test': `./gradlew checkstyleNohttp ${excludeWebapp}`, 'java:jar': './gradlew bootJar -x test -x integrationTest', 'java:war': './gradlew bootWar -Pwar -x test -x integrationTest', 'java:docker': './gradlew bootJar jibDockerBuild', - 'backend:unit:test': `./gradlew test integrationTest ${excludeWebpack} ${javaCommonLog} ${javaTestLog}`, + 'backend:unit:test': `./gradlew test integrationTest ${excludeWebapp} ${javaCommonLog} ${javaTestLog}`, 'postci:e2e:package': 'cp build/libs/*SNAPSHOT.$npm_package_config_packaging e2e.$npm_package_config_packaging', }); } scriptsStorage.set({ - 'java:jar:dev': 'npm run java:jar -- -Pdev,webpack', + 'java:jar:dev': 'npm run java:jar -- -Pdev,webapp', 'java:jar:prod': 'npm run java:jar -- -Pprod', - 'java:war:dev': 'npm run java:war -- -Pdev,webpack', + 'java:war:dev': 'npm run java:war -- -Pdev,webapp', 'java:war:prod': 'npm run java:war -- -Pprod', - 'java:docker:dev': 'npm run java:docker -- -Pdev,webpack', + 'java:docker:dev': 'npm run java:docker -- -Pdev,webapp', 'java:docker:prod': 'npm run java:docker -- -Pprod', 'ci:backend:test': 'npm run backend:info && npm run backend:doc:test && npm run backend:nohttp:test && npm run backend:unit:test', diff --git a/generators/server/templates/gradle/profile_dev.gradle.ejs b/generators/server/templates/gradle/profile_dev.gradle.ejs index 0b45a5d5bdea..90be5fa67c80 100644 --- a/generators/server/templates/gradle/profile_dev.gradle.ejs +++ b/generators/server/templates/gradle/profile_dev.gradle.ejs @@ -47,7 +47,7 @@ bootRun { } <%_ if (!skipClient) { _%> -task webpack(type: <%= _.upperFirst(clientPackageManager) %>Task) { +task webapp(type: <%= _.upperFirst(clientPackageManager) %>Task) { inputs.files("package-lock.json") inputs.files("build.gradle") inputs.dir("<%= CLIENT_MAIN_SRC_DIR %>") @@ -60,7 +60,7 @@ task webpack(type: <%= _.upperFirst(clientPackageManager) %>Task) { dependsOn <%= clientPackageManager %><%_ if (clientPackageManager === 'npm') { _%>Install<%_ } _%> - args = ["run", "webpack:build"] + args = ["run", "webapp:build"] environment = [APP_VERSION: project.version] } <%_ } _%> @@ -88,6 +88,6 @@ processResources { } <%_ if (!skipClient) { _%> -processResources.dependsOn webpack +processResources.dependsOn webapp bootJar.dependsOn processResources <%_ } _%> diff --git a/generators/server/templates/gradle/profile_prod.gradle.ejs b/generators/server/templates/gradle/profile_prod.gradle.ejs index e9b40ea3e6bd..1a6044101ac2 100644 --- a/generators/server/templates/gradle/profile_prod.gradle.ejs +++ b/generators/server/templates/gradle/profile_prod.gradle.ejs @@ -43,12 +43,12 @@ bootRun { } <%_ if (!skipClient) { _%> -task webpack_test(type: <%= _.upperFirst(clientPackageManager) %>Task, dependsOn: "<%= clientPackageManager %><%_ if (clientPackageManager === 'npm') { _%>Install<%_ } _%>") { - args = ["run", "webpack:test"] +task webapp_test(type: <%= _.upperFirst(clientPackageManager) %>Task, dependsOn: "<%= clientPackageManager %><%_ if (clientPackageManager === 'npm') { _%>Install<%_ } _%>") { + args = ["run", "webapp:test"] } -task webpack(type: <%= _.upperFirst(clientPackageManager) %>Task, dependsOn: "<%= clientPackageManager %><%_ if (clientPackageManager === 'npm') { _%>Install<%_ } _%>") { - args = ["run", "webpack:prod"] +task webapp(type: <%= _.upperFirst(clientPackageManager) %>Task, dependsOn: "<%= clientPackageManager %><%_ if (clientPackageManager === 'npm') { _%>Install<%_ } _%>") { + args = ["run", "webapp:prod"] environment = [APP_VERSION: project.version] } <%_ } _%> @@ -76,7 +76,7 @@ processResources { } <%_ if (!skipClient) { _%> -test.dependsOn webpack_test -processResources.dependsOn webpack +test.dependsOn webapp_test +processResources.dependsOn webapp bootJar.dependsOn processResources <%_ } _%> diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs index 1956524cf487..6e2a1160129c 100644 --- a/generators/server/templates/pom.xml.ejs +++ b/generators/server/templates/pom.xml.ejs @@ -1548,7 +1548,7 @@ <%_ if (!skipClient) { _%> - webpack + webapp true @@ -1589,13 +1589,13 @@ - webpack build dev + webapp build dev <%= clientPackageManager %> generate-resources - run webpack:build + run webapp:build ${project.version} @@ -1705,24 +1705,24 @@ - webpack build test + webapp build test <%= clientPackageManager %> test - run webpack:test + run webapp:test false - webpack build prod + webapp build prod <%= clientPackageManager %> generate-resources - run webpack:prod + run webapp:prod ${project.version} diff --git a/test-integration/scripts/21-tests-backend.sh b/test-integration/scripts/21-tests-backend.sh index 863af9f18bb3..c90bf733fae4 100755 --- a/test-integration/scripts/21-tests-backend.sh +++ b/test-integration/scripts/21-tests-backend.sh @@ -16,7 +16,7 @@ fi #------------------------------------------------------------------------------- # Exclude webpack task from Gradle if not skipping client #------------------------------------------------------------------------------- -JHI_GRADLE_EXCLUDE_WEBPACK="-x webpack" +JHI_GRADLE_EXCLUDE_WEBPACK="-x webapp" if [[ $(grep "\"skipClient\": true" .yo-rc.json) != "" ]]; then JHI_GRADLE_EXCLUDE_WEBPACK="" fi @@ -62,7 +62,7 @@ fi #------------------------------------------------------------------------------- cd "$JHI_FOLDER_APP" if [ -f "mvnw" ]; then - ./mvnw -ntp -P-webpack verify $JHI_MAVEN_ENABLE_TESTCONTAINERS --batch-mode \ + ./mvnw -ntp -P-webapp verify $JHI_MAVEN_ENABLE_TESTCONTAINERS --batch-mode \ -Dlogging.level.ROOT=OFF \ -Dlogging.level.org.testcontainers=INFO \ -Dlogging.level.org.zalando=OFF \ From a669d042057062e1170aa2cd21288d399acd8a6a Mon Sep 17 00:00:00 2001 From: Vishal Mahajan Date: Mon, 30 Nov 2020 00:19:33 +0530 Subject: [PATCH 0047/1179] Revert change in react scripts used in ci --- generators/client/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/client/index.js b/generators/client/index.js index 861197e9a3a3..4a7daeef8843 100644 --- a/generators/client/index.js +++ b/generators/client/index.js @@ -327,10 +327,10 @@ module.exports = class JHipsterClientGenerator extends BaseBlueprintGenerator { if (this.clientFramework === 'react') { scriptsStorage.set( 'ci:frontend:test', - 'npm run webapp:build:$npm_package_config_default_environment && npm run test-ci' + 'npm run webpack:build:$npm_package_config_default_environment && npm run test-ci' ); } else { - scriptsStorage.set('ci:frontend:build', 'npm run webapp:build:$npm_package_config_default_environment'); + scriptsStorage.set('ci:frontend:build', 'npm run webpack:build:$npm_package_config_default_environment'); scriptsStorage.set('ci:frontend:test', 'npm run ci:frontend:build && npm test'); } From dd3c44d15245f3147969a19829d05fe75199dd87 Mon Sep 17 00:00:00 2001 From: Mathieu Abou-Aichi Date: Sun, 29 Nov 2020 20:46:36 +0100 Subject: [PATCH 0048/1179] Added tests --- .../jdl-to-json-relationship-converter.js | 35 +++++++++---------- test/jdl/jdl-importer.spec.js | 14 ++++++++ test/jdl/test-files/big_sample.jdl | 2 +- 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js b/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js index e87b710afbce..30a894c15cdc 100644 --- a/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js +++ b/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js @@ -63,7 +63,10 @@ function getRelatedRelationships(relationships, entityNames) { if (jdlRelationship.from === entityName) { relationshipsRelatedToEntity.from.push(jdlRelationship); } - if (jdlRelationship.to === entityName && jdlRelationship.injectedFieldInTo) { + if ( + jdlRelationship.to === entityName && + (jdlRelationship.injectedFieldInTo || Object.keys(jdlRelationship.options.destination).length !== 0) + ) { relationshipsRelatedToEntity.to.push(jdlRelationship); } }); @@ -110,7 +113,6 @@ function setRelationshipsFromEntity(relatedRelationships, entityName) { } convertedRelationship.ownerSide = true; } - setOptionsForRelationship(relationshipToConvert, convertedRelationship); setOptionsForRelationshipSourceSide(relationshipToConvert, convertedRelationship); const convertedEntityRelationships = convertedRelationships.get(entityName); convertedEntityRelationships.push(convertedRelationship); @@ -142,17 +144,14 @@ function setRelationshipsToEntity(relatedRelationships, entityName) { } else if (relationshipToConvert.type === MANY_TO_ONE && relationshipToConvert.injectedFieldInTo) { convertedRelationship.relationshipType = 'one-to-many'; } - setOptionsForRelationship(relationshipToConvert, convertedRelationship); setOptionsForRelationshipDestinationSide(relationshipToConvert, convertedRelationship); const convertedEntityRelationships = convertedRelationships.get(entityName); convertedEntityRelationships.push(convertedRelationship); }); } -function setOptionsForRelationship(relationshipToConvert, convertedRelationship) { - if (!convertedRelationship.options) { - convertedRelationship.options = {}; - } +function setOptionsForRelationshipSourceSide(relationshipToConvert, convertedRelationship) { + convertedRelationship.options = convertedRelationship.options || {}; relationshipToConvert.forEachGlobalOption((optionName, optionValue) => { if (optionName === JPA_DERIVED_IDENTIFIER) { if (convertedRelationship.ownerSide) { @@ -162,15 +161,6 @@ function setOptionsForRelationship(relationshipToConvert, convertedRelationship) convertedRelationship.options[optionName] = optionValue; } }); - if (Object.keys(convertedRelationship.options).length === 0) { - delete convertedRelationship.options; - } -} - -function setOptionsForRelationshipSourceSide(relationshipToConvert, convertedRelationship) { - if (!convertedRelationship.options) { - convertedRelationship.options = {}; - } relationshipToConvert.forEachDestinationOption((optionName, optionValue) => { convertedRelationship.options[optionName] = optionValue; }); @@ -180,9 +170,16 @@ function setOptionsForRelationshipSourceSide(relationshipToConvert, convertedRel } function setOptionsForRelationshipDestinationSide(relationshipToConvert, convertedRelationship) { - if (!convertedRelationship.options) { - convertedRelationship.options = {}; - } + convertedRelationship.options = convertedRelationship.options || {}; + relationshipToConvert.forEachGlobalOption((optionName, optionValue) => { + if (optionName === JPA_DERIVED_IDENTIFIER) { + if (convertedRelationship.ownerSide) { + convertedRelationship.useJPADerivedIdentifier = optionValue; + } + } else { + convertedRelationship.options[optionName] = optionValue; + } + }); relationshipToConvert.forEachSourceOption((optionName, optionValue) => { convertedRelationship.options[optionName] = optionValue; }); diff --git a/test/jdl/jdl-importer.spec.js b/test/jdl/jdl-importer.spec.js index ea6581ac9148..6d7554b8955a 100644 --- a/test/jdl/jdl-importer.spec.js +++ b/test/jdl/jdl-importer.spec.js @@ -109,6 +109,9 @@ describe('JDLImporter', () => { ], relationships: [ { + options: { + id: '42', + }, relationshipType: 'one-to-one', relationshipName: 'location', otherEntityName: 'location', @@ -378,6 +381,17 @@ describe('JDLImporter', () => { otherEntityName: 'country', otherEntityRelationshipName: 'location', }, + { + options: { + id: true, + }, + otherEntityField: 'id', + otherEntityName: 'department', + otherEntityRelationshipName: 'location', + ownerSide: false, + relationshipName: 'department', + relationshipType: 'one-to-one', + }, ], name: 'Location', entityTableName: 'location', diff --git a/test/jdl/test-files/big_sample.jdl b/test/jdl/test-files/big_sample.jdl index c5f940fb3bc4..8b8385840c81 100644 --- a/test/jdl/test-files/big_sample.jdl +++ b/test/jdl/test-files/big_sample.jdl @@ -68,7 +68,7 @@ entity Region { } relationship OneToOne { - Department{location} to Location + @id Department{location} to @id(42) Location } relationship OneToMany { From da52c2acfa3afe6b6b827d36d231886df675223f Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Mon, 30 Nov 2020 05:16:16 +0200 Subject: [PATCH 0049/1179] [angular] Use linting rule @angular-eslint/relative-url-prefix --- generators/client/templates/angular/.eslintrc.json.ejs | 1 + .../app/account/password/password-strength-bar.component.ts.ejs | 2 +- .../src/main/webapp/app/admin/docs/docs.component.ts.ejs | 2 +- .../blocks/metrics-request/metrics-request.component.ts.ejs | 2 +- .../angular/src/main/webapp/app/home/home.component.ts.ejs | 2 +- .../src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs | 2 +- .../webapp/app/layouts/profiles/page-ribbon.component.ts.ejs | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/generators/client/templates/angular/.eslintrc.json.ejs b/generators/client/templates/angular/.eslintrc.json.ejs index 6c8ddd06f60d..d71f9e1d6456 100644 --- a/generators/client/templates/angular/.eslintrc.json.ejs +++ b/generators/client/templates/angular/.eslintrc.json.ejs @@ -55,6 +55,7 @@ "style": "camelCase" } ], + "@angular-eslint/relative-url-prefix": "error", "@typescript-eslint/ban-types": [ "error", { diff --git a/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar.component.ts.ejs index 56de602a3ec9..cf07480b8144 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar.component.ts.ejs @@ -30,7 +30,7 @@ import { Component, ElementRef, Input, Renderer2 } from '@angular/core';
`, - styleUrls: ['password-strength-bar.scss'], + styleUrls: ['./password-strength-bar.scss'], }) export class PasswordStrengthBarComponent { colors = ['#F00', '#F90', '#FF0', '#9F0', '#0F0']; diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.ts.ejs index 042c79119dcc..72f96ed8b66a 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.ts.ejs @@ -21,6 +21,6 @@ import { Component } from '@angular/core'; @Component({ selector: '<%= jhiPrefixDashed %>-docs', templateUrl: './docs.component.html', - styleUrls: ['docs.scss'], + styleUrls: ['./docs.scss'], }) export class DocsComponent {} diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts.ejs index 857e767d41ef..034b3e848db7 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts.ejs @@ -22,7 +22,7 @@ import { HttpServerRequests } from 'app/admin/metrics/metrics.model'; @Component({ selector: '<%= jhiPrefixDashed %>-metrics-request', - templateUrl: 'metrics-request.component.html', + templateUrl: './metrics-request.component.html', changeDetection: ChangeDetectionStrategy.OnPush, }) export class MetricsRequestComponent { diff --git a/generators/client/templates/angular/src/main/webapp/app/home/home.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/home/home.component.ts.ejs index 2a005f745a85..76e11ed386b8 100644 --- a/generators/client/templates/angular/src/main/webapp/app/home/home.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/home/home.component.ts.ejs @@ -31,7 +31,7 @@ import { Account } from 'app/core/user/account.model'; @Component({ selector: '<%= jhiPrefixDashed %>-home', templateUrl: './home.component.html', - styleUrls: ['home.scss'], + styleUrls: ['./home.scss'], }) export class HomeComponent implements OnInit<% if (authenticationType !== 'oauth2') { %>, OnDestroy<% } %> { account: Account | null = null; diff --git a/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs index a2e32655b532..1c724ac7247f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs @@ -34,7 +34,7 @@ import { ProfileService } from 'app/layouts/profiles/profile.service'; @Component({ selector: '<%= jhiPrefixDashed %>-navbar', templateUrl: './navbar.component.html', - styleUrls: ['navbar.scss'], + styleUrls: ['./navbar.scss'], }) export class NavbarComponent implements OnInit { inProduction?: boolean; diff --git a/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs index 7fb33bb2e4b7..c6f7a2a10240 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs @@ -28,7 +28,7 @@ import { ProfileService } from './profile.service'; <%= jhiPrefix %>Translate="global.ribbon.{{ ribbonEnv }}"<% } %>>{{ ribbonEnv }} `, - styleUrls: ['page-ribbon.scss'], + styleUrls: ['./page-ribbon.scss'], }) export class PageRibbonComponent implements OnInit { ribbonEnv$?: Observable; From 789c74352ea42a83346d9eefb46bbfef2833d747 Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Mon, 30 Nov 2020 06:07:09 +0200 Subject: [PATCH 0050/1179] [angular] Move find-language-from-key.pipe and translate.directive into language subfolder --- generators/cleanup.js | 4 +++- generators/client/files-angular.js | 4 ++-- .../angular/src/main/webapp/app/app.module.ts.ejs | 2 +- .../webapp/app/layouts/main/main.component.ts.ejs | 2 +- .../find-language-from-key.pipe.ts.ejs | 0 .../shared/{ => language}/translate.directive.ts.ejs | 0 .../src/main/webapp/app/shared/shared.module.ts.ejs | 4 ++-- .../spec/app/layouts/main/main.component.spec.ts.ejs | 2 +- .../spec/app/shared/item-count.component.spec.ts.ejs | 2 +- .../{ => language}/translate.directive.spec.ts.ejs | 2 +- generators/generator-base-private.js | 2 +- test/utils/expected-files.js | 12 ++++++------ 12 files changed, 19 insertions(+), 17 deletions(-) rename generators/client/templates/angular/src/main/webapp/app/shared/{ => language}/find-language-from-key.pipe.ts.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/shared/{ => language}/translate.directive.ts.ejs (100%) rename generators/client/templates/angular/src/test/javascript/spec/app/shared/{ => language}/translate.directive.spec.ts.ejs (95%) diff --git a/generators/cleanup.js b/generators/cleanup.js index 466ea46892f1..0adf985efbdd 100644 --- a/generators/cleanup.js +++ b/generators/cleanup.js @@ -127,7 +127,6 @@ function cleanupOldFiles(generator) { generator.removeFolder(`${ANGULAR_DIR}core/icons`); generator.removeFolder(`${ANGULAR_DIR}core/language`); generator.removeFolder(`${ANGULAR_DIR}shared/auth`); - generator.removeFolder(`${ANGULAR_DIR}shared/language`); generator.removeFolder(`${ANGULAR_DIR}shared/constants`); generator.removeFolder(`${ANGULAR_DIR}shared/util`); generator.removeFile(`${ANGULAR_DIR}core/core.module.ts`); @@ -154,6 +153,9 @@ function cleanupOldFiles(generator) { // unreleased files and folders cleanup for v7 developers generator.removeFile(`${ANGULAR_DIR}shared/duration.pipe.ts`); + generator.removeFile(`${ANGULAR_DIR}shared/find-language-from-key.pipe.ts`); + generator.removeFile(`${ANGULAR_DIR}shared/translate.directive.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/shared/translate.directive.spec.ts`); generator.removeFile(`${ANGULAR_DIR}core/user/authority.model.ts`); generator.removeFolder(`${ANGULAR_DIR}core/config`); generator.removeFolder(`${ANGULAR_DIR}core/event-manager`); diff --git a/generators/client/files-angular.js b/generators/client/files-angular.js index 9f2aa76bdcfb..e71c1952f199 100644 --- a/generators/client/files-angular.js +++ b/generators/client/files-angular.js @@ -372,7 +372,7 @@ const files = { { condition: generator => generator.enableTranslation, path: ANGULAR_DIR, - templates: ['shared/find-language-from-key.pipe.ts', 'shared/translate.directive.ts'], + templates: ['shared/language/find-language-from-key.pipe.ts', 'shared/language/translate.directive.ts'], }, ], angularAuthService: [ @@ -439,7 +439,7 @@ const files = { { condition: generator => generator.enableTranslation, path: CLIENT_TEST_SRC_DIR, - templates: ['spec/app/shared/translate.directive.spec.ts'], + templates: ['spec/app/shared/language/translate.directive.spec.ts'], }, { condition: generator => !generator.skipUserManagement, diff --git a/generators/client/templates/angular/src/main/webapp/app/app.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/app.module.ts.ejs index 0f59a43edb40..4d2f177cc497 100644 --- a/generators/client/templates/angular/src/main/webapp/app/app.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/app.module.ts.ejs @@ -46,7 +46,7 @@ import { NgbDateDayjsAdapter } from './config/datepicker-adapter'; import { fontAwesomeIcons } from './config/font-awesome-icons'; import { httpInterceptorProviders } from 'app/core/interceptor/index'; <%_ if (enableI18nRTL) { _%> -import { FindLanguageFromKeyPipe } from 'app/shared/find-language-from-key.pipe'; +import { FindLanguageFromKeyPipe } from 'app/shared/language/find-language-from-key.pipe'; <%_ } _%> <%_ if (enableTranslation) { _%> import { translatePartialLoader, missingTranslationHandler } from './config/translation.config'; diff --git a/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.ts.ejs index 88c1c59cd837..d1476db5c34f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.ts.ejs @@ -25,7 +25,7 @@ import { TranslateService, LangChangeEvent } from '@ngx-translate/core'; import { AccountService } from 'app/core/auth/account.service'; <%_ if (enableI18nRTL) { _%> -import { FindLanguageFromKeyPipe } from 'app/shared/find-language-from-key.pipe'; +import { FindLanguageFromKeyPipe } from 'app/shared/language/find-language-from-key.pipe'; <%_ } _%> @Component({ diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/find-language-from-key.pipe.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/shared/find-language-from-key.pipe.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/translate.directive.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/shared/translate.directive.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.ts.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/shared.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/shared.module.ts.ejs index d811acef5121..b47b691084f2 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/shared.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/shared.module.ts.ejs @@ -19,8 +19,8 @@ import { NgModule } from '@angular/core'; import { SharedLibsModule } from './shared-libs.module'; <%_ if (enableTranslation) { _%> -import { FindLanguageFromKeyPipe } from './find-language-from-key.pipe'; -import { TranslateDirective } from './translate.directive'; +import { FindLanguageFromKeyPipe } from './language/find-language-from-key.pipe'; +import { TranslateDirective } from './language/translate.directive'; <%_ } _%> import { AlertComponent } from './alert/alert.component'; import { AlertErrorComponent } from './alert/alert-error.component'; diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/layouts/main/main.component.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/layouts/main/main.component.spec.ts.ejs index a134885a15f3..dacf6d41aa48 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/layouts/main/main.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/layouts/main/main.component.spec.ts.ejs @@ -29,7 +29,7 @@ import { TranslateModule, TranslateService, LangChangeEvent } from '@ngx-transla import { MainComponent } from 'app/layouts/main/main.component'; import { AccountService } from 'app/core/auth/account.service'; <%_ if (enableI18nRTL) { _%> -import { FindLanguageFromKeyPipe } from 'app/shared/find-language-from-key.pipe'; +import { FindLanguageFromKeyPipe } from 'app/shared/language/find-language-from-key.pipe'; <%_ } _%> describe('Component Tests', () => { diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/shared/item-count.component.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/shared/item-count.component.spec.ts.ejs index 5c018bdb993b..d9d33f2ec4c3 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/shared/item-count.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/shared/item-count.component.spec.ts.ejs @@ -23,7 +23,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { ItemCountComponent } from 'app/shared/item-count.component'; <%_ if (enableTranslation) { _%> -import { TranslateDirective } from 'app/shared/translate.directive'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; <%_ } _%> describe('ItemCountComponent test', () => { diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/shared/translate.directive.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/shared/language/translate.directive.spec.ts.ejs similarity index 95% rename from generators/client/templates/angular/src/test/javascript/spec/app/shared/translate.directive.spec.ts.ejs rename to generators/client/templates/angular/src/test/javascript/spec/app/shared/language/translate.directive.spec.ts.ejs index 17cacfd78cc8..ed92bc526df3 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/shared/translate.directive.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/shared/language/translate.directive.spec.ts.ejs @@ -20,7 +20,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { TranslateDirective } from 'app/shared/translate.directive'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; @Component({ template: `
Translate="test">
`, diff --git a/generators/generator-base-private.js b/generators/generator-base-private.js index ff4abd092109..fd7ae6cd26f8 100644 --- a/generators/generator-base-private.js +++ b/generators/generator-base-private.js @@ -309,7 +309,7 @@ module.exports = class JHipsterBasePrivateGenerator extends Generator { updateLanguagesInLanguagePipe(languages) { const fullPath = this.clientFramework === ANGULAR - ? `${this.CLIENT_MAIN_SRC_DIR}app/shared/find-language-from-key.pipe.ts` + ? `${this.CLIENT_MAIN_SRC_DIR}app/shared/language/find-language-from-key.pipe.ts` : `${this.CLIENT_MAIN_SRC_DIR}/app/config/translation.ts`; try { let content = '{\n'; diff --git a/test/utils/expected-files.js b/test/utils/expected-files.js index 1c7dfc10d997..6b048a247241 100644 --- a/test/utils/expected-files.js +++ b/test/utils/expected-files.js @@ -448,8 +448,8 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/shared/date/duration.pipe.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/date/format-medium-date.pipe.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/date/format-medium-datetime.pipe.ts`, - `${CLIENT_MAIN_SRC_DIR}app/shared/find-language-from-key.pipe.ts`, - `${CLIENT_MAIN_SRC_DIR}app/shared/translate.directive.ts`, + `${CLIENT_MAIN_SRC_DIR}app/shared/language/find-language-from-key.pipe.ts`, + `${CLIENT_MAIN_SRC_DIR}app/shared/language/translate.directive.ts`, `${CLIENT_MAIN_SRC_DIR}app/config/language.constants.ts`, `${CLIENT_MAIN_SRC_DIR}app/config/translation.config.ts`, `${CLIENT_MAIN_SRC_DIR}app/login/login.model.ts`, @@ -491,7 +491,7 @@ const expectedFiles = { `${CLIENT_TEST_SRC_DIR}spec/app/shared/date/format-medium-datetime.pipe.spec.ts`, `${CLIENT_TEST_SRC_DIR}spec/app/shared/sort/sort.directive.spec.ts`, `${CLIENT_TEST_SRC_DIR}spec/app/shared/sort/sort-by.directive.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/shared/translate.directive.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/shared/language/translate.directive.spec.ts`, 'tsconfig.app.json', 'tsconfig.spec.json', 'tsconfig.json', @@ -595,8 +595,8 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}i18n/fr/global.json`, `${CLIENT_MAIN_SRC_DIR}app/config/language.constants.ts`, `${CLIENT_MAIN_SRC_DIR}app/config/translation.config.ts`, - `${CLIENT_MAIN_SRC_DIR}app/shared/find-language-from-key.pipe.ts`, - `${CLIENT_MAIN_SRC_DIR}app/shared/translate.directive.ts`, + `${CLIENT_MAIN_SRC_DIR}app/shared/language/find-language-from-key.pipe.ts`, + `${CLIENT_MAIN_SRC_DIR}app/shared/language/translate.directive.ts`, ], i18nRtl: [ @@ -606,7 +606,7 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}i18n/ar-ly/global.json`, `${CLIENT_MAIN_SRC_DIR}app/config/language.constants.ts`, `${CLIENT_MAIN_SRC_DIR}content/scss/rtl.scss`, - `${CLIENT_MAIN_SRC_DIR}app/shared/find-language-from-key.pipe.ts`, + `${CLIENT_MAIN_SRC_DIR}app/shared/language/find-language-from-key.pipe.ts`, ], session: [ From faf14b3fc921b6ce1191881030426e52d42fb91d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Nov 2020 05:02:30 +0000 Subject: [PATCH 0051/1179] chore(deps): bump aws-sdk from 2.797.0 to 2.799.0 Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.797.0 to 2.799.0. - [Release notes](https://github.com/aws/aws-sdk-js/releases) - [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js/compare/v2.797.0...v2.799.0) Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9e60a97da22e..27221a61e636 100644 --- a/package-lock.json +++ b/package-lock.json @@ -532,9 +532,9 @@ "integrity": "sha512-mu394MH+yY2TSKMyH+978PcGMZ8sRNks2PuVeH6c2ED4mimR2LEE039MVcIGVhtmG54cKEMh4gKhxKL/CLaX/w==" }, "aws-sdk": { - "version": "2.797.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.797.0.tgz", - "integrity": "sha512-fFc/2Xr7NkSXlZ9+2rCOFovA9NO1OnIyEaJFVwMM9gaqzucwRAfNNT0Pa1Kua5dhWrcf/mX0Z4mCDnTBf0/5mA==", + "version": "2.799.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.799.0.tgz", + "integrity": "sha512-NYAoiNU+bJXhlJsC0rFqrmD5t5ho7/VxldmziP6HLPYHfOCI9Uvk6UVjfPmhLWPm0mHnIxhsHqmsNGyjhHNYmw==", "requires": { "buffer": "4.9.2", "events": "1.1.1", diff --git a/package.json b/package.json index 9b272f1d1aac..2bb136b2e26e 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "test": "mocha --no-insight --forbid-only --parallel" }, "dependencies": { - "aws-sdk": "2.797.0", + "aws-sdk": "2.799.0", "axios": "0.21.0", "chalk": "4.1.0", "chevrotain": "7.0.3", From 6dc26873b89801abc76e4a7aecc44ce9cd0f62af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Nov 2020 05:03:32 +0000 Subject: [PATCH 0052/1179] chore(deps): bump prettier from 2.1.2 to 2.2.1 Bumps [prettier](https://github.com/prettier/prettier) from 2.1.2 to 2.2.1. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.1.2...2.2.1) Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9e60a97da22e..8422eb3d9730 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5114,9 +5114,9 @@ "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" }, "prettier": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz", - "integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==" + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", + "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==" }, "prettier-linter-helpers": { "version": "1.0.0", diff --git a/package.json b/package.json index 9b272f1d1aac..cb367dfcde6b 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "os-locale": "5.0.0", "parse-gitignore": "1.0.1", "pluralize": "8.0.0", - "prettier": "2.1.2", + "prettier": "2.2.1", "prettier-plugin-java": "1.0.0", "prettier-plugin-packagejson": "2.2.8", "progress": "2.0.3", From 09ceb1411f78fb62ac422e042e1ec8276495bff8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Nov 2020 07:19:08 +0000 Subject: [PATCH 0053/1179] chore(deps-dev): bump webpack-notifier Bumps [webpack-notifier](https://github.com/Turbo87/webpack-notifier) from 1.10.1 to 1.11.0. - [Release notes](https://github.com/Turbo87/webpack-notifier/releases) - [Changelog](https://github.com/Turbo87/webpack-notifier/blob/master/CHANGELOG.md) - [Commits](https://github.com/Turbo87/webpack-notifier/compare/v1.10.1...v1.11.0) Signed-off-by: dependabot[bot] --- generators/client/templates/angular/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/templates/angular/package.json b/generators/client/templates/angular/package.json index b6de51df52b3..c65c1d0675a7 100644 --- a/generators/client/templates/angular/package.json +++ b/generators/client/templates/angular/package.json @@ -37,6 +37,6 @@ "rimraf": "3.0.2", "simple-progress-webpack-plugin": "1.1.2", "webpack-bundle-analyzer": "4.1.0", - "webpack-notifier": "1.10.1" + "webpack-notifier": "1.11.0" } } From fdb1b1a03a4179b6fb68d061158547f18b71ee9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Nov 2020 08:08:00 +0000 Subject: [PATCH 0054/1179] chore(deps): bump prettier-plugin-java from 1.0.0 to 1.0.1 Bumps [prettier-plugin-java](https://github.com/jhipster/prettier-java) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/jhipster/prettier-java/releases) - [Changelog](https://github.com/jhipster/prettier-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/jhipster/prettier-java/compare/v1.0.0...v1.0.1) Signed-off-by: dependabot[bot] --- package-lock.json | 15 ++++----------- package.json | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 84c87e883b54..3c87317c6ccd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5128,20 +5128,13 @@ } }, "prettier-plugin-java": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/prettier-plugin-java/-/prettier-plugin-java-1.0.0.tgz", - "integrity": "sha512-GIiCUnTimGL5aLd4PHLUH+HveDAhwyn+fKnUqYv7y80LCNtkoHfqCNp4ntpDRX5FsTohx0FthAol3zTtHHOuOQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/prettier-plugin-java/-/prettier-plugin-java-1.0.1.tgz", + "integrity": "sha512-QaNLrBra0pzSba29cq7N5JPqHPlEM+3FRp17ViL66fKcStu+5mDOS+YV99mbkpHTrsMAuChW3rZ85ZDs4Smupw==", "requires": { "java-parser": "1.0.0", "lodash": "4.17.20", - "prettier": "2.2.0" - }, - "dependencies": { - "prettier": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.0.tgz", - "integrity": "sha512-yYerpkvseM4iKD/BXLYUkQV5aKt4tQPqaGW6EsZjzyu0r7sVZZNPJW4Y8MyKmicp6t42XUPcBVA+H6sB3gqndw==" - } + "prettier": "2.2.1" } }, "prettier-plugin-packagejson": { diff --git a/package.json b/package.json index 4d61ffb863af..b1d4c61347c5 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "parse-gitignore": "1.0.1", "pluralize": "8.0.0", "prettier": "2.2.1", - "prettier-plugin-java": "1.0.0", + "prettier-plugin-java": "1.0.1", "prettier-plugin-packagejson": "2.2.8", "progress": "2.0.3", "randexp": "0.5.3", From 7647db2be6f87a771f40a4d62c4b873a491b786d Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Mon, 30 Nov 2020 07:11:26 +0200 Subject: [PATCH 0055/1179] [angular] Refactor user management folder structure --- generators/cleanup.js | 12 ++++++++++ generators/client/files-angular.js | 24 +++++++++---------- ...anagement-delete-dialog.component.html.ejs | 0 ...-management-delete-dialog.component.ts.ejs | 0 .../user-management-detail.component.html.ejs | 0 .../user-management-detail.component.ts.ejs | 0 .../user-management.component.html.ejs | 0 .../user-management.component.ts.ejs | 2 +- .../user-management-update.component.html.ejs | 0 .../user-management-update.component.ts.ejs | 0 .../user-management.module.ts.ejs | 8 +++---- .../user-management.route.ts.ejs | 6 ++--- ...gement-delete-dialog.component.spec.ts.ejs | 2 +- ...er-management-detail.component.spec.ts.ejs | 2 +- .../user-management.component.spec.ts.ejs | 2 +- ...er-management-update.component.spec.ts.ejs | 2 +- test/utils/expected-files.js | 24 +++++++++---------- 17 files changed, 48 insertions(+), 36 deletions(-) rename generators/client/templates/angular/src/main/webapp/app/admin/user-management/{ => delete}/user-management-delete-dialog.component.html.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/admin/user-management/{ => delete}/user-management-delete-dialog.component.ts.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/admin/user-management/{ => detail}/user-management-detail.component.html.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/admin/user-management/{ => detail}/user-management-detail.component.ts.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/admin/user-management/{ => list}/user-management.component.html.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/admin/user-management/{ => list}/user-management.component.ts.ejs (97%) rename generators/client/templates/angular/src/main/webapp/app/admin/user-management/{ => update}/user-management-update.component.html.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/admin/user-management/{ => update}/user-management-update.component.ts.ejs (100%) rename generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/{ => delete}/user-management-delete-dialog.component.spec.ts.ejs (97%) rename generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/{ => detail}/user-management-detail.component.spec.ts.ejs (98%) rename generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/{ => list}/user-management.component.spec.ts.ejs (99%) rename generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/{ => update}/user-management-update.component.spec.ts.ejs (98%) diff --git a/generators/cleanup.js b/generators/cleanup.js index 0adf985efbdd..fb0fbf63e4dd 100644 --- a/generators/cleanup.js +++ b/generators/cleanup.js @@ -113,6 +113,18 @@ function cleanupOldFiles(generator) { generator.removeFile(`${ANGULAR_DIR}admin/audits/audits.route.ts`); generator.removeFile(`${ANGULAR_DIR}admin/audits/audits.module.ts`); generator.removeFile(`${ANGULAR_DIR}admin/audits/audits.service.ts`); + generator.removeFile(`${ANGULAR_DIR}admin/user-management/user-management-delete-dialog.component.ts`); + generator.removeFile(`${ANGULAR_DIR}admin/user-management/user-management-delete-dialog.component.html`); + generator.removeFile(`${ANGULAR_DIR}admin/user-management/user-management-detail.component.ts`); + generator.removeFile(`${ANGULAR_DIR}admin/user-management/user-management-detail.component.html`); + generator.removeFile(`${ANGULAR_DIR}admin/user-management/user-management.component.ts`); + generator.removeFile(`${ANGULAR_DIR}admin/user-management/user-management.component.html`); + generator.removeFile(`${ANGULAR_DIR}admin/user-management/user-management-update.component.ts`); + generator.removeFile(`${ANGULAR_DIR}admin/user-management/user-management-update.component.html`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/user-management-detail.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/user-management.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/user-management-update.component.spec.ts`); generator.removeFile(`${ANGULAR_DIR}entities/entity.module.ts`); generator.removeFile(`${ANGULAR_DIR}shared/util/datepicker-adapter.ts`); generator.removeFile(`${ANGULAR_DIR}shared/login/login.component.ts`); diff --git a/generators/client/files-angular.js b/generators/client/files-angular.js index e71c1952f199..ec2f0d0bc329 100644 --- a/generators/client/files-angular.js +++ b/generators/client/files-angular.js @@ -281,14 +281,14 @@ const files = { templates: [ { file: 'admin/user-management/user-management.route.ts', method: 'processJs' }, 'admin/user-management/user-management.module.ts', - 'admin/user-management/user-management.component.ts', - { file: 'admin/user-management/user-management.component.html', method: 'processHtml' }, - 'admin/user-management/user-management-detail.component.ts', - { file: 'admin/user-management/user-management-detail.component.html', method: 'processHtml' }, - 'admin/user-management/user-management-update.component.ts', - { file: 'admin/user-management/user-management-update.component.html', method: 'processHtml' }, - 'admin/user-management/user-management-delete-dialog.component.ts', - { file: 'admin/user-management/user-management-delete-dialog.component.html', method: 'processHtml' }, + 'admin/user-management/list/user-management.component.ts', + { file: 'admin/user-management/list/user-management.component.html', method: 'processHtml' }, + 'admin/user-management/detail/user-management-detail.component.ts', + { file: 'admin/user-management/detail/user-management-detail.component.html', method: 'processHtml' }, + 'admin/user-management/update/user-management-update.component.ts', + { file: 'admin/user-management/update/user-management-update.component.html', method: 'processHtml' }, + 'admin/user-management/delete/user-management-delete-dialog.component.ts', + { file: 'admin/user-management/delete/user-management-delete-dialog.component.html', method: 'processHtml' }, ], }, { @@ -463,10 +463,10 @@ const files = { condition: generator => !generator.skipUserManagement, path: CLIENT_TEST_SRC_DIR, templates: [ - 'spec/app/admin/user-management/user-management.component.spec.ts', - 'spec/app/admin/user-management/user-management-detail.component.spec.ts', - 'spec/app/admin/user-management/user-management-update.component.spec.ts', - 'spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts', + 'spec/app/admin/user-management/list/user-management.component.spec.ts', + 'spec/app/admin/user-management/detail/user-management-detail.component.spec.ts', + 'spec/app/admin/user-management/update/user-management-update.component.spec.ts', + 'spec/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts', // user service tests 'spec/app/core/user/user.service.spec.ts', ], diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.html.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management-delete-dialog.component.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.ts.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management-detail.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management-detail.component.html.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management-detail.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management-detail.component.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.ts.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.component.html.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs similarity index 97% rename from generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs index 755612e5f780..dd41894c8571 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs @@ -31,7 +31,7 @@ import { AccountService } from 'app/core/auth/account.service'; import { Account } from 'app/core/user/account.model'; import { UserService } from 'app/core/user/user.service'; import { User } from 'app/core/user/user.model'; -import { UserManagementDeleteDialogComponent } from './user-management-delete-dialog.component'; +import { UserManagementDeleteDialogComponent } from '../delete/user-management-delete-dialog.component'; @Component({ selector: '<%= jhiPrefixDashed %>-user-mgmt', diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management-update.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management-update.component.html.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management-update.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management-update.component.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.ts.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.module.ts.ejs index 185eba3b4e8c..98c0acd909fb 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.module.ts.ejs @@ -20,10 +20,10 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { SharedModule } from 'app/shared/shared.module'; -import { UserManagementComponent } from './user-management.component'; -import { UserManagementDetailComponent } from './user-management-detail.component'; -import { UserManagementUpdateComponent } from './user-management-update.component'; -import { UserManagementDeleteDialogComponent } from './user-management-delete-dialog.component'; +import { UserManagementComponent } from './list/user-management.component'; +import { UserManagementDetailComponent } from './detail/user-management-detail.component'; +import { UserManagementUpdateComponent } from './update/user-management-update.component'; +import { UserManagementDeleteDialogComponent } from './delete/user-management-delete-dialog.component'; import { userManagementRoute } from './user-management.route'; @NgModule({ diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.route.ts.ejs index a55040062af6..ded03b9e779c 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.route.ts.ejs @@ -22,9 +22,9 @@ import { Observable, of } from 'rxjs'; import { User, IUser } from 'app/core/user/user.model'; import { UserService } from 'app/core/user/user.service'; -import { UserManagementComponent } from './user-management.component'; -import { UserManagementDetailComponent } from './user-management-detail.component'; -import { UserManagementUpdateComponent } from './user-management-update.component'; +import { UserManagementComponent } from './list/user-management.component'; +import { UserManagementDetailComponent } from './detail/user-management-detail.component'; +import { UserManagementUpdateComponent } from './update/user-management-update.component'; @Injectable({ providedIn: 'root' }) export class UserManagementResolve implements Resolve { diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs similarity index 97% rename from generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts.ejs rename to generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs index ad46fd99f73c..de4dd987f28a 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs @@ -23,7 +23,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { of } from 'rxjs'; -import { UserManagementDeleteDialogComponent } from 'app/admin/user-management/user-management-delete-dialog.component'; +import { UserManagementDeleteDialogComponent } from 'app/admin/user-management/delete/user-management-delete-dialog.component'; import { UserService } from 'app/core/user/user.service'; describe('Component Tests', () => { diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs similarity index 98% rename from generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts.ejs rename to generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs index 7578aa99bb46..fcf50c639d89 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-detail.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs @@ -24,7 +24,7 @@ import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; import { Authority } from 'app/config/authority.constants'; -import { UserManagementDetailComponent } from 'app/admin/user-management/user-management-detail.component'; +import { UserManagementDetailComponent } from 'app/admin/user-management/detail/user-management-detail.component'; import { User } from 'app/core/user/user.model'; describe('Component Tests', () => { diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/list/user-management.component.spec.ts.ejs similarity index 99% rename from generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts.ejs rename to generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/list/user-management.component.spec.ts.ejs index 1e088c2937b5..86b2c0acf95d 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/list/user-management.component.spec.ts.ejs @@ -28,7 +28,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ActivatedRoute, Router } from '@angular/router'; import { of } from 'rxjs'; -import { UserManagementComponent } from 'app/admin/user-management/user-management.component'; +import { UserManagementComponent } from 'app/admin/user-management/list/user-management.component'; import { UserService } from 'app/core/user/user.service'; import { User } from 'app/core/user/user.model'; import { AccountService } from 'app/core/auth/account.service'; diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/update/user-management-update.component.spec.ts.ejs similarity index 98% rename from generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts.ejs rename to generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/update/user-management-update.component.spec.ts.ejs index 74da60e34ab7..c153af0fca3d 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/user-management-update.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/update/user-management-update.component.spec.ts.ejs @@ -27,7 +27,7 @@ import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; import { Authority } from 'app/config/authority.constants'; -import { UserManagementUpdateComponent } from 'app/admin/user-management/user-management-update.component'; +import { UserManagementUpdateComponent } from 'app/admin/user-management/update/user-management-update.component'; import { UserService } from 'app/core/user/user.service'; import { User } from 'app/core/user/user.model'; diff --git a/test/utils/expected-files.js b/test/utils/expected-files.js index 6b048a247241..fd4184c53358 100644 --- a/test/utils/expected-files.js +++ b/test/utils/expected-files.js @@ -353,15 +353,15 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/account/settings/settings.component.html`, `${CLIENT_MAIN_SRC_DIR}app/account/settings/settings.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/account/settings/settings.route.ts`, - `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/user-management-delete-dialog.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/user-management-delete-dialog.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/user-management-detail.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/user-management-detail.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/user-management-update.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/user-management-update.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/user-management.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/delete/user-management-delete-dialog.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/delete/user-management-delete-dialog.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/detail/user-management-detail.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/detail/user-management-detail.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/update/user-management-update.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/update/user-management-update.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/list/user-management.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/list/user-management.component.html`, `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/user-management.module.ts`, - `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/user-management.component.html`, `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/user-management.route.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/user/user.model.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/user/user.service.ts`, @@ -372,10 +372,10 @@ const expectedFiles = { `${CLIENT_TEST_SRC_DIR}spec/app/account/password/password.component.spec.ts`, `${CLIENT_TEST_SRC_DIR}spec/app/account/register/register.component.spec.ts`, `${CLIENT_TEST_SRC_DIR}spec/app/account/settings/settings.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/user-management-detail.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/user-management-update.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/user-management.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/detail/user-management-detail.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/update/user-management-update.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/list/user-management.component.spec.ts`, `${CLIENT_TEST_SRC_DIR}spec/app/core/user/user.service.spec.ts`, ], From 5b39bb8f3eba7954bad7babb2a0ad8ed44bb97ba Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Mon, 30 Nov 2020 10:35:46 +0200 Subject: [PATCH 0056/1179] [angular] Synchronize account.service test location with source location --- generators/cleanup.js | 1 + generators/client/files-angular.js | 2 +- .../spec/app/core/{user => auth}/account.service.spec.ts.ejs | 0 test/utils/expected-files.js | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) rename generators/client/templates/angular/src/test/javascript/spec/app/core/{user => auth}/account.service.spec.ts.ejs (100%) diff --git a/generators/cleanup.js b/generators/cleanup.js index fb0fbf63e4dd..558012ea74d5 100644 --- a/generators/cleanup.js +++ b/generators/cleanup.js @@ -154,6 +154,7 @@ function cleanupOldFiles(generator) { generator.removeFile('proxy.conf.json'); generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/core/login/login-modal.component.spec.ts`); generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/core/login/login-modal.service.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/core/user/account.service.spec.ts`); generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/audits/audits.component.spec.ts`); generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/audits/audits.service.spec.ts`); generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/shared/login/login.component.spec.ts`); diff --git a/generators/client/files-angular.js b/generators/client/files-angular.js index ec2f0d0bc329..d3dd1c5f780a 100644 --- a/generators/client/files-angular.js +++ b/generators/client/files-angular.js @@ -419,7 +419,7 @@ const files = { path: CLIENT_TEST_SRC_DIR, templates: [ 'jest.conf.js', - 'spec/app/core/user/account.service.spec.ts', + 'spec/app/core/auth/account.service.spec.ts', 'spec/app/core/util/event-manager.service.spec.ts', 'spec/app/core/util/data-util.service.spec.ts', 'spec/app/core/util/parse-links.service.spec.ts', diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/core/user/account.service.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/core/auth/account.service.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/core/user/account.service.spec.ts.ejs rename to generators/client/templates/angular/src/test/javascript/spec/app/core/auth/account.service.spec.ts.ejs diff --git a/test/utils/expected-files.js b/test/utils/expected-files.js index fd4184c53358..e13e7b772999 100644 --- a/test/utils/expected-files.js +++ b/test/utils/expected-files.js @@ -475,7 +475,7 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}swagger-ui/dist/images/throbber.gif`, `${CLIENT_MAIN_SRC_DIR}swagger-ui/index.html`, `${CLIENT_TEST_SRC_DIR}jest.conf.js`, - `${CLIENT_TEST_SRC_DIR}spec/app/core/user/account.service.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/core/auth/account.service.spec.ts`, `${CLIENT_TEST_SRC_DIR}spec/app/core/util/event-manager.service.spec.ts`, `${CLIENT_TEST_SRC_DIR}spec/app/core/util/data-util.service.spec.ts`, `${CLIENT_TEST_SRC_DIR}spec/app/core/util/parse-links.service.spec.ts`, From b6509f4bda7cb0d437436befe15686a94454ea3d Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Mon, 30 Nov 2020 12:40:11 +0200 Subject: [PATCH 0057/1179] [angular] Refactor entity management folder structure --- generators/entity-client/files.js | 52 ++++--- generators/entity-client/index.js | 36 +++++ ...anagement-delete-dialog.component.html.ejs | 0 ...-management-delete-dialog.component.ts.ejs | 2 +- ...ntity-management-detail.component.html.ejs | 0 .../entity-management-detail.component.ts.ejs | 0 .../entity-management-routing.module.ts.ejs | 6 +- .../entities/entity-management.module.ts.ejs | 8 +- .../entity-management.component.html.ejs | 0 .../entity-management.component.ts.ejs | 4 +- .../{ => list}/infinite-scroll-template.ejs | 0 .../{ => list}/no-pagination-template.ejs | 0 .../{ => list}/pagination-template.ejs | 0 ...ntity-management-update.component.html.ejs | 0 .../entity-management-update.component.ts.ejs | 2 +- ...gement-delete-dialog.component.spec.ts.ejs | 2 +- ...ty-management-detail.component.spec.ts.ejs | 2 +- .../entity-management.component.spec.ts.ejs | 2 +- ...ty-management-update.component.spec.ts.ejs | 2 +- test/utils/expected-files.js | 144 +++++++++--------- 20 files changed, 151 insertions(+), 111 deletions(-) rename generators/entity-client/templates/angular/src/main/webapp/app/entities/{ => delete}/entity-management-delete-dialog.component.html.ejs (100%) rename generators/entity-client/templates/angular/src/main/webapp/app/entities/{ => delete}/entity-management-delete-dialog.component.ts.ejs (94%) rename generators/entity-client/templates/angular/src/main/webapp/app/entities/{ => detail}/entity-management-detail.component.html.ejs (100%) rename generators/entity-client/templates/angular/src/main/webapp/app/entities/{ => detail}/entity-management-detail.component.ts.ejs (100%) rename generators/entity-client/templates/angular/src/main/webapp/app/entities/{ => list}/entity-management.component.html.ejs (100%) rename generators/entity-client/templates/angular/src/main/webapp/app/entities/{ => list}/entity-management.component.ts.ejs (97%) rename generators/entity-client/templates/angular/src/main/webapp/app/entities/{ => list}/infinite-scroll-template.ejs (100%) rename generators/entity-client/templates/angular/src/main/webapp/app/entities/{ => list}/no-pagination-template.ejs (100%) rename generators/entity-client/templates/angular/src/main/webapp/app/entities/{ => list}/pagination-template.ejs (100%) rename generators/entity-client/templates/angular/src/main/webapp/app/entities/{ => update}/entity-management-update.component.html.ejs (100%) rename generators/entity-client/templates/angular/src/main/webapp/app/entities/{ => update}/entity-management-update.component.ts.ejs (99%) rename generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/{ => delete}/entity-management-delete-dialog.component.spec.ts.ejs (97%) rename generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/{ => detail}/entity-management-detail.component.spec.ts.ejs (97%) rename generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/{ => list}/entity-management.component.spec.ts.ejs (99%) rename generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/{ => update}/entity-management-update.component.spec.ts.ejs (97%) diff --git a/generators/entity-client/files.js b/generators/entity-client/files.js index d3f1227029cb..7df0689d68d0 100644 --- a/generators/entity-client/files.js +++ b/generators/entity-client/files.js @@ -51,16 +51,17 @@ const angularFiles = { path: ANGULAR_DIR, templates: [ { - file: 'entities/entity-management.component.html', + file: 'entities/list/entity-management.component.html', method: 'processHtml', template: true, - renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}.component.html`, + renameTo: generator => `entities/${generator.entityFolderName}/list/${generator.entityFileName}.component.html`, }, { - file: 'entities/entity-management-detail.component.html', + file: 'entities/detail/entity-management-detail.component.html', method: 'processHtml', template: true, - renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}-detail.component.html`, + renameTo: generator => + `entities/${generator.entityFolderName}/detail/${generator.entityFileName}-detail.component.html`, }, { file: 'entities/entity-management.module.ts', @@ -75,12 +76,12 @@ const angularFiles = { renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}-routing-resolve.service.ts`, }, { - file: 'entities/entity-management.component.ts', - renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}.component.ts`, + file: 'entities/list/entity-management.component.ts', + renameTo: generator => `entities/${generator.entityFolderName}/list/${generator.entityFileName}.component.ts`, }, { - file: 'entities/entity-management-detail.component.ts', - renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}-detail.component.ts`, + file: 'entities/detail/entity-management-detail.component.ts', + renameTo: generator => `entities/${generator.entityFolderName}/detail/${generator.entityFileName}-detail.component.ts`, }, { file: 'entities/entity.service.ts', @@ -93,25 +94,27 @@ const angularFiles = { path: ANGULAR_DIR, templates: [ { - file: 'entities/entity-management-update.component.html', + file: 'entities/update/entity-management-update.component.html', method: 'processHtml', template: true, - renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}-update.component.html`, + renameTo: generator => + `entities/${generator.entityFolderName}/update/${generator.entityFileName}-update.component.html`, }, { - file: 'entities/entity-management-delete-dialog.component.html', + file: 'entities/delete/entity-management-delete-dialog.component.html', method: 'processHtml', template: true, renameTo: generator => - `entities/${generator.entityFolderName}/${generator.entityFileName}-delete-dialog.component.html`, + `entities/${generator.entityFolderName}/delete/${generator.entityFileName}-delete-dialog.component.html`, }, { - file: 'entities/entity-management-update.component.ts', - renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}-update.component.ts`, + file: 'entities/update/entity-management-update.component.ts', + renameTo: generator => `entities/${generator.entityFolderName}/update/${generator.entityFileName}-update.component.ts`, }, { - file: 'entities/entity-management-delete-dialog.component.ts', - renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}-delete-dialog.component.ts`, + file: 'entities/delete/entity-management-delete-dialog.component.ts', + renameTo: generator => + `entities/${generator.entityFolderName}/delete/${generator.entityFileName}-delete-dialog.component.ts`, }, ], }, @@ -122,13 +125,14 @@ const angularFiles = { path: CLIENT_TEST_SRC_DIR, templates: [ { - file: 'spec/app/entities/entity-management-detail.component.spec.ts', + file: 'spec/app/entities/detail/entity-management-detail.component.spec.ts', renameTo: generator => - `spec/app/entities/${generator.entityFolderName}/${generator.entityFileName}-detail.component.spec.ts`, + `spec/app/entities/${generator.entityFolderName}/detail/${generator.entityFileName}-detail.component.spec.ts`, }, { - file: 'spec/app/entities/entity-management.component.spec.ts', - renameTo: generator => `spec/app/entities/${generator.entityFolderName}/${generator.entityFileName}.component.spec.ts`, + file: 'spec/app/entities/list/entity-management.component.spec.ts', + renameTo: generator => + `spec/app/entities/${generator.entityFolderName}/list/${generator.entityFileName}.component.spec.ts`, }, { file: 'spec/app/entities/entity-management.service.spec.ts', @@ -141,14 +145,14 @@ const angularFiles = { path: CLIENT_TEST_SRC_DIR, templates: [ { - file: 'spec/app/entities/entity-management-update.component.spec.ts', + file: 'spec/app/entities/update/entity-management-update.component.spec.ts', renameTo: generator => - `spec/app/entities/${generator.entityFolderName}/${generator.entityFileName}-update.component.spec.ts`, + `spec/app/entities/${generator.entityFolderName}/update/${generator.entityFileName}-update.component.spec.ts`, }, { - file: 'spec/app/entities/entity-management-delete-dialog.component.spec.ts', + file: 'spec/app/entities/delete/entity-management-delete-dialog.component.spec.ts', renameTo: generator => - `spec/app/entities/${generator.entityFolderName}/${generator.entityFileName}-delete-dialog.component.spec.ts`, + `spec/app/entities/${generator.entityFolderName}/delete/${generator.entityFileName}-delete-dialog.component.spec.ts`, }, ], }, diff --git a/generators/entity-client/index.js b/generators/entity-client/index.js index 89e759a7ac55..f61128070571 100644 --- a/generators/entity-client/index.js +++ b/generators/entity-client/index.js @@ -72,6 +72,42 @@ module.exports = class extends BaseBlueprintGenerator { cleanup() { if (this.isJhipsterVersionLessThan('7.0.0') && this.jhipsterConfig.clientFramework === ANGULAR) { this.removeFile(`${this.CLIENT_MAIN_SRC_DIR}/app/entities/${this.entityFolderName}/${this.entityFileName}.route.ts`); + this.removeFile( + `${this.CLIENT_MAIN_SRC_DIR}/app/entities/${this.entityFolderName}/${this.entityFileName}.component.ts` + ); + this.removeFile( + `${this.CLIENT_MAIN_SRC_DIR}/app/entities/${this.entityFolderName}/${this.entityFileName}.component.html` + ); + this.removeFile( + `${this.CLIENT_MAIN_SRC_DIR}/app/entities/${this.entityFolderName}/${this.entityFileName}-detail.component.ts` + ); + this.removeFile( + `${this.CLIENT_MAIN_SRC_DIR}/app/entities/${this.entityFolderName}/${this.entityFileName}-detail.component.html` + ); + this.removeFile( + `${this.CLIENT_MAIN_SRC_DIR}/app/entities/${this.entityFolderName}/${this.entityFileName}-delete-dialog.component.ts` + ); + this.removeFile( + `${this.CLIENT_MAIN_SRC_DIR}/app/entities/${this.entityFolderName}/${this.entityFileName}-delete-dialog.component.html` + ); + this.removeFile( + `${this.CLIENT_MAIN_SRC_DIR}/app/entities/${this.entityFolderName}/${this.entityFileName}-update.component.ts` + ); + this.removeFile( + `${this.CLIENT_MAIN_SRC_DIR}/app/entities/${this.entityFolderName}/${this.entityFileName}-update.component.html` + ); + this.removeFile( + `${this.CLIENT_TEST_SRC_DIR}/spec/app/entities/${this.entityFolderName}/${this.entityFileName}.component.spec.ts` + ); + this.removeFile( + `${this.CLIENT_TEST_SRC_DIR}/spec/app/entities/${this.entityFolderName}/${this.entityFileName}-detail.component.spec.ts` + ); + this.removeFile( + `${this.CLIENT_TEST_SRC_DIR}/spec/app/entities/${this.entityFolderName}/${this.entityFileName}-delete-dialog.component.spec.ts` + ); + this.removeFile( + `${this.CLIENT_TEST_SRC_DIR}/spec/app/entities/${this.entityFolderName}/${this.entityFileName}-update.component.spec.ts` + ); } }, ...writeFiles(), diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-delete-dialog.component.html.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.html.ejs similarity index 100% rename from generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-delete-dialog.component.html.ejs rename to generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.html.ejs diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-delete-dialog.component.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.ts.ejs similarity index 94% rename from generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-delete-dialog.component.ts.ejs rename to generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.ts.ejs index c97aaf97914d..2d8bfc193de9 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-delete-dialog.component.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.ts.ejs @@ -20,7 +20,7 @@ import { Component } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { I<%= entityAngularName %> } from 'app/shared/model/<%= entityModelFileName %>.model'; -import { <%= entityAngularName %>Service } from './<%= entityFileName %>.service'; +import { <%= entityAngularName %>Service } from '../<%= entityFileName %>.service'; @Component({ templateUrl: './<%= entityFileName %>-delete-dialog.component.html' diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-detail.component.html.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.html.ejs similarity index 100% rename from generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-detail.component.html.ejs rename to generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.html.ejs diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-detail.component.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.ts.ejs similarity index 100% rename from generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-detail.component.ts.ejs rename to generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.ts.ejs diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs index d68c2458ea5c..1e6da2b1dc66 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs @@ -22,10 +22,10 @@ import { RouterModule, Routes } from '@angular/router'; import { Authority } from 'app/config/authority.constants'; import { UserRouteAccessService } from 'app/core/auth/user-route-access.service'; -import { <%= entityAngularName %>Component } from './<%= entityFileName %>.component'; -import { <%= entityAngularName %>DetailComponent } from './<%= entityFileName %>-detail.component'; +import { <%= entityAngularName %>Component } from './list/<%= entityFileName %>.component'; +import { <%= entityAngularName %>DetailComponent } from './detail/<%= entityFileName %>-detail.component'; <%_ if (!readOnly) { _%> -import { <%= entityAngularName %>UpdateComponent } from './<%= entityFileName %>-update.component'; +import { <%= entityAngularName %>UpdateComponent } from './update/<%= entityFileName %>-update.component'; <%_ } _%> import { <%= entityAngularName %>RoutingResolveService } from './<%= entityFileName %>-routing-resolve.service'; import { <%= microservicePrefix %><%= entityAngularName %>Module } from './<%= entityFileName %>.module'; diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.module.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.module.ts.ejs index 68f61631cd1b..4ffb02fb5785 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.module.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.module.ts.ejs @@ -20,11 +20,11 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { SharedModule } from 'app/shared/shared.module'; -import { <%= entityAngularName %>Component } from './<%= entityFileName %>.component'; -import { <%= entityAngularName %>DetailComponent } from './<%= entityFileName %>-detail.component'; +import { <%= entityAngularName %>Component } from './list/<%= entityFileName %>.component'; +import { <%= entityAngularName %>DetailComponent } from './detail/<%= entityFileName %>-detail.component'; <%_ if (!readOnly) { _%> -import { <%= entityAngularName %>UpdateComponent } from './<%= entityFileName %>-update.component'; -import { <%= entityAngularName %>DeleteDialogComponent } from './<%= entityFileName %>-delete-dialog.component'; +import { <%= entityAngularName %>UpdateComponent } from './update/<%= entityFileName %>-update.component'; +import { <%= entityAngularName %>DeleteDialogComponent } from './delete/<%= entityFileName %>-delete-dialog.component'; <%_ } _%> @NgModule({ diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.component.html.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.html.ejs similarity index 100% rename from generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.component.html.ejs rename to generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.html.ejs diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.component.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.ts.ejs similarity index 97% rename from generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.component.ts.ejs rename to generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.ts.ejs index fac34ee8bb7e..e437b824c623 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.component.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.ts.ejs @@ -32,9 +32,9 @@ import { I<%= entityAngularName %> } from 'app/shared/model/<%= entityModelFileN <%_ if (pagination !== 'no') { %> import { ITEMS_PER_PAGE } from 'app/config/pagination.constants'; <%_ } _%> -import { <%= entityAngularName %>Service } from './<%= entityFileName %>.service'; +import { <%= entityAngularName %>Service } from '../<%= entityFileName %>.service'; <%_ if (!readOnly) { _%> -import { <%= entityAngularName %>DeleteDialogComponent } from './<%= entityFileName %>-delete-dialog.component'; +import { <%= entityAngularName %>DeleteDialogComponent } from '../delete/<%= entityFileName %>-delete-dialog.component'; <%_ } _%> <%_ if (fieldsContainBlob) { _%> import { DataUtils } from 'app/core/util/data-util.service'; diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/infinite-scroll-template.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/infinite-scroll-template.ejs similarity index 100% rename from generators/entity-client/templates/angular/src/main/webapp/app/entities/infinite-scroll-template.ejs rename to generators/entity-client/templates/angular/src/main/webapp/app/entities/list/infinite-scroll-template.ejs diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/no-pagination-template.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/no-pagination-template.ejs similarity index 100% rename from generators/entity-client/templates/angular/src/main/webapp/app/entities/no-pagination-template.ejs rename to generators/entity-client/templates/angular/src/main/webapp/app/entities/list/no-pagination-template.ejs diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/pagination-template.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/pagination-template.ejs similarity index 100% rename from generators/entity-client/templates/angular/src/main/webapp/app/entities/pagination-template.ejs rename to generators/entity-client/templates/angular/src/main/webapp/app/entities/list/pagination-template.ejs diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-update.component.html.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.html.ejs similarity index 100% rename from generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-update.component.html.ejs rename to generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.html.ejs diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-update.component.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.ejs similarity index 99% rename from generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-update.component.ts.ejs rename to generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.ejs index 65a330d52f32..11b5a3bea472 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-update.component.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.ejs @@ -51,7 +51,7 @@ import { DATE_TIME_FORMAT } from 'app/config/input.constants'; <%_ } _%> import { I<%= entityAngularName %>, <%= entityAngularName %> } from 'app/shared/model/<%= entityModelFileName %>.model'; -import { <%= entityAngularName %>Service } from './<%= entityFileName %>.service'; +import { <%= entityAngularName %>Service } from '../<%= entityFileName %>.service'; <%_ if (fieldsContainBlob) { _%> import { AlertError } from 'app/shared/alert/alert-error.model'; import { EventManager, EventWithContent } from 'app/core/util/event-manager.service'; diff --git a/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/entity-management-delete-dialog.component.spec.ts.ejs b/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs similarity index 97% rename from generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/entity-management-delete-dialog.component.spec.ts.ejs rename to generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs index 5c463b30d88b..06033accd693 100644 --- a/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/entity-management-delete-dialog.component.spec.ts.ejs +++ b/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs @@ -26,7 +26,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { of } from 'rxjs'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { <%= entityAngularName %>DeleteDialogComponent } from 'app/entities/<%= entityFolderName %>/<%= entityFileName %>-delete-dialog.component'; +import { <%= entityAngularName %>DeleteDialogComponent } from 'app/entities/<%= entityFolderName %>/delete/<%= entityFileName %>-delete-dialog.component'; import { <%= entityAngularName %>Service } from 'app/entities/<%= entityFolderName %>/<%= entityFileName %>.service'; describe('Component Tests', () => { diff --git a/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/entity-management-detail.component.spec.ts.ejs b/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/detail/entity-management-detail.component.spec.ts.ejs similarity index 97% rename from generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/entity-management-detail.component.spec.ts.ejs rename to generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/detail/entity-management-detail.component.spec.ts.ejs index eba576ba207c..993c4f9b0806 100644 --- a/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/entity-management-detail.component.spec.ts.ejs +++ b/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/detail/entity-management-detail.component.spec.ts.ejs @@ -23,7 +23,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; -import { <%= entityAngularName %>DetailComponent } from 'app/entities/<%= entityFolderName %>/<%= entityFileName %>-detail.component'; +import { <%= entityAngularName %>DetailComponent } from 'app/entities/<%= entityFolderName %>/detail/<%= entityFileName %>-detail.component'; import { <%= entityAngularName %> } from 'app/shared/model/<%= entityModelFileName %>.model'; <%_ if (fieldsContainBlob) { _%> import { DataUtils } from 'app/core/util/data-util.service'; diff --git a/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/entity-management.component.spec.ts.ejs b/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/list/entity-management.component.spec.ts.ejs similarity index 99% rename from generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/entity-management.component.spec.ts.ejs rename to generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/list/entity-management.component.spec.ts.ejs index 5805b9c14b61..4414e113c5c2 100644 --- a/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/entity-management.component.spec.ts.ejs +++ b/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/list/entity-management.component.spec.ts.ejs @@ -34,7 +34,7 @@ import { ActivatedRoute } from '@angular/router'; <%_ } _%> import { of } from 'rxjs'; -import { <%= entityAngularName %>Component } from 'app/entities/<%= entityFolderName %>/<%= entityFileName %>.component'; +import { <%= entityAngularName %>Component } from 'app/entities/<%= entityFolderName %>/list/<%= entityFileName %>.component'; import { <%= entityAngularName %>Service } from 'app/entities/<%= entityFolderName %>/<%= entityFileName %>.service'; import { <%= entityAngularName %> } from 'app/shared/model/<%= entityModelFileName %>.model'; diff --git a/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/entity-management-update.component.spec.ts.ejs b/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/update/entity-management-update.component.spec.ts.ejs similarity index 97% rename from generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/entity-management-update.component.spec.ts.ejs rename to generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/update/entity-management-update.component.spec.ts.ejs index 5021acae0571..f1d9e4f66ecb 100644 --- a/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/entity-management-update.component.spec.ts.ejs +++ b/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/update/entity-management-update.component.spec.ts.ejs @@ -28,7 +28,7 @@ import { FormBuilder } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; -import { <%= entityAngularName %>UpdateComponent } from 'app/entities/<%= entityFolderName %>/<%= entityFileName %>-update.component'; +import { <%= entityAngularName %>UpdateComponent } from 'app/entities/<%= entityFolderName %>/update/<%= entityFileName %>-update.component'; import { <%= entityAngularName %>Service } from 'app/entities/<%= entityFolderName %>/<%= entityFileName %>.service'; import { <%= entityAngularName %> } from 'app/shared/model/<%= entityModelFileName %>.model'; diff --git a/test/utils/expected-files.js b/test/utils/expected-files.js index 1c7dfc10d997..e4cc48cfa688 100644 --- a/test/utils/expected-files.js +++ b/test/utils/expected-files.js @@ -14,117 +14,117 @@ const { const expectedFiles = { entity: { clientNg2: [ - `${CLIENT_MAIN_SRC_DIR}app/entities/foo/foo.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/entities/foo/foo-detail.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/entities/foo/foo-update.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/entities/foo/foo-delete-dialog.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo/list/foo.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo/detail/foo-detail.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo/update/foo-update.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo/delete/foo-delete-dialog.component.html`, `${CLIENT_MAIN_SRC_DIR}app/entities/foo/foo-routing.module.ts`, `${CLIENT_MAIN_SRC_DIR}app/entities/foo/foo-routing-resolve.service.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/foo/foo.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/foo/foo-update.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/foo/foo-delete-dialog.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/foo/foo-detail.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo/list/foo.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo/update/foo-update.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo/delete/foo-delete-dialog.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo/detail/foo-detail.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/entities/foo/foo.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/model/foo.model.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo/foo-delete-dialog.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo/foo-detail.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo/foo-update.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo/foo.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo/delete/foo-delete-dialog.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo/detail/foo-detail.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo/update/foo-update.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo/list/foo.component.spec.ts`, `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo/foo.service.spec.ts`, ], clientNg2WithSuffix: [ - `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/foo-management.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/foo-management-detail.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/foo-management-update.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/foo-management-delete-dialog.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/list/foo-management.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/detail/foo-management-detail.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/update/foo-management-update.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/delete/foo-management-delete-dialog.component.html`, `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/foo-management-routing.module.ts`, `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/foo-management-routing-resolve.service.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/foo-management.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/foo-management-update.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/foo-management-delete-dialog.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/foo-management-detail.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/list/foo-management.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/update/foo-management-update.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/delete/foo-management-delete-dialog.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/detail/foo-management-detail.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/foo-management.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/model/foo-management.model.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo-management/foo-management-delete-dialog.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo-management/foo-management-detail.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo-management/foo-management-update.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo-management/foo-management.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo-management/delete/foo-management-delete-dialog.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo-management/detail/foo-management-detail.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo-management/update/foo-management-update.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo-management/list/foo-management.component.spec.ts`, `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo-management/foo-management.service.spec.ts`, ], clientNg2WithRootFolder: [ - `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/foo.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/foo-detail.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/foo-update.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/foo-delete-dialog.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/list/foo.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/detail/foo-detail.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/update/foo-update.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/delete/foo-delete-dialog.component.html`, `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/foo-routing.module.ts`, `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/foo-routing-resolve.service.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/foo.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/foo-update.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/foo-delete-dialog.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/foo-detail.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/list/foo.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/update/foo-update.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/delete/foo-delete-dialog.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/detail/foo-detail.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/foo.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/model/test-root/foo.model.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo/foo-delete-dialog.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo/foo-detail.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo/foo-update.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo/foo.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo/delete/foo-delete-dialog.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo/detail/foo-detail.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo/update/foo-update.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo/list/foo.component.spec.ts`, `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo/foo.service.spec.ts`, ], clientNg2WithRootFolderAndSuffix: [ - `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/foo-management.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/foo-management-detail.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/foo-management-update.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/foo-management-delete-dialog.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/list/foo-management.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/detail/foo-management-detail.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/update/foo-management-update.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/delete/foo-management-delete-dialog.component.html`, `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/foo-management-routing.module.ts`, `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/foo-management-routing-resolve.service.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/foo-management.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/foo-management-update.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/foo-management-delete-dialog.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/foo-management-detail.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/list/foo-management.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/update/foo-management-update.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/delete/foo-management-delete-dialog.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/detail/foo-management-detail.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/foo-management.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/model/test-root/foo-management.model.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo-management/foo-management-delete-dialog.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo-management/foo-management-detail.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo-management/foo-management-update.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo-management/foo-management.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo-management/delete/foo-management-delete-dialog.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo-management/detail/foo-management-detail.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo-management/update/foo-management-update.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo-management/list/foo-management.component.spec.ts`, `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo-management/foo-management.service.spec.ts`, ], clientNg2GatewayMicroserviceEntity: [ - `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/bar.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/bar-detail.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/bar-update.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/bar-delete-dialog.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/list/bar.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/detail/bar-detail.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/update/bar-update.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/delete/bar-delete-dialog.component.html`, `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/bar-routing.module.ts`, `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/bar-routing-resolve.service.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/bar.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/bar-update.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/bar-delete-dialog.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/bar-detail.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/list/bar.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/update/bar-update.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/delete/bar-delete-dialog.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/detail/bar-detail.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/bar.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/model/sampleMicroservice/bar.model.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/bar/bar-delete-dialog.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/bar/bar-detail.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/bar/bar-update.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/bar/bar.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/bar/delete/bar-delete-dialog.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/bar/detail/bar-detail.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/bar/update/bar-update.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/bar/list/bar.component.spec.ts`, `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/bar/bar.service.spec.ts`, ], clientBazGatewayMicroserviceEntity: [ - `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/baz.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/baz-detail.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/baz-update.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/baz-delete-dialog.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/list/baz.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/detail/baz-detail.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/update/baz-update.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/delete/baz-delete-dialog.component.html`, `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/baz-routing.module.ts`, `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/baz-routing-resolve.service.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/baz.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/baz-update.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/baz-delete-dialog.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/baz-detail.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/list/baz.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/update/baz-update.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/delete/baz-delete-dialog.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/detail/baz-detail.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/baz.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/model/sampleMicroservice/baz.model.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/baz/baz-delete-dialog.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/baz/baz-detail.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/baz/baz-update.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/baz/baz.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/baz/delete/baz-delete-dialog.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/baz/detail/baz-detail.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/baz/update/baz-update.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/baz/list/baz.component.spec.ts`, `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/baz/baz.service.spec.ts`, ], server: [ From 99c233502c323372e12acf1f8f01bf6bca193ed4 Mon Sep 17 00:00:00 2001 From: evertude Date: Mon, 30 Nov 2020 17:54:38 +0100 Subject: [PATCH 0058/1179] Neo4j relation rework --- .../main/java/package/domain/Entity.java.ejs | 30 ++++++++++++++----- .../repository/EntityRepository.java.ejs | 11 ++----- .../web/rest/EntityResourceIT.java.ejs | 2 +- generators/entity/index.js | 4 ++- 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs b/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs index c3cd7fd70fec..1a577e641942 100644 --- a/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs @@ -285,10 +285,16 @@ public class <%= asEntity(entityClass) %> implements Serializable { } relationships.forEach((relationship, idx) => { - const otherEntityRelationshipName = relationships[idx].otherEntityRelationshipName; + const otherEntityRelationshipName = + databaseType === 'neo4j' + ? "HAS_" + _.toUpper(_.snakeCase(relationships[idx].otherEntityRelationshipName)) + : relationships[idx].otherEntityRelationshipName; const otherEntityRelationshipNamePlural = relationships[idx].otherEntityRelationshipNamePlural; const otherEntityIsEmbedded = relationships[idx].otherEntityIsEmbedded; - const relationshipName = relationships[idx].relationshipName; + const relationshipName = + databaseType === 'neo4j' + ? "HAS_" + _.toUpper(_.snakeCase(relationships[idx].relationshipName)) + : relationships[idx].relationshipName; const relationshipFieldName = relationships[idx].relationshipFieldName; const relationshipFieldNamePlural = relationships[idx].relationshipFieldNamePlural; const joinTableName = getJoinTableName(entityTableName, relationshipName, prodDatabaseType); @@ -331,7 +337,7 @@ relationships.forEach((relationship, idx) => { @N1qlJoin(on = "lks.<%= relationshipFieldName %>=meta(rks).id", fetchType = FetchType.IMMEDIATE) <%_ } _%> <%_ } else if (databaseType === 'neo4j') { _%> - @Relationship + @Relationship("<%= relationshipName %>") <%_ } else if (databaseType === 'sql' && reactive) { _%> @Transient <%_ } _%> @@ -361,9 +367,13 @@ relationships.forEach((relationship, idx) => { @N1qlJoin(on = "lks.<%= relationshipFieldName %>=meta(rks).id", fetchType = FetchType.IMMEDIATE) <%_ } - } else if (databaseType === 'neo4j') { _%> - @Relationship("<%= relationshipFieldName %>") - <%_ } _%> + } else if (databaseType === 'neo4j') { + if (relationship.ignoreOtherSideProperty) { _%> + @Relationship(value = "<%= otherEntityRelationshipName %>", direction = Relationship.Direction.INCOMING) + <%_ } else {_%> + @Relationship("<%= relationshipName %>") + <%_ } + } _%> <%_ if (relationship.ignoreOtherSideProperty) { _%> @JsonIgnoreProperties(value = { <%_ relationship.otherEntity.relationships.forEach(otherRelationship => { _%> @@ -404,6 +414,10 @@ relationships.forEach((relationship, idx) => { @N1qlJoin(on = "lks.<%= relationshipFieldNamePlural %>=meta(rks).id", fetchType = FetchType.IMMEDIATE) <%_ } + } else if (databaseType === 'neo4j') { _%> + @Relationship(<%_ + if (ownerSide === true) { _%>"<%= relationshipName %>"<%_ + } else { _%>value = "<%= otherEntityRelationshipName %>", direction = Relationship.Direction.INCOMING<%_ } _%>)<%_ } if (relationship.ignoreOtherSideProperty) { _%> @JsonIgnoreProperties(value = { @@ -456,7 +470,9 @@ relationships.forEach((relationship, idx) => { <%_ } _%> @Transient - <%_ } _%> + <%_ } else if (databaseType === 'neo4j') { _%> + @Relationship("<%= relationshipName %>") + <%_ } _%> private <%= asEntity(otherEntityNameCapitalized) %> <%= relationshipFieldName %>; <%_ } diff --git a/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs b/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs index c4d1e0446a19..214283728813 100644 --- a/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs @@ -50,7 +50,7 @@ import org.springframework.data.cassandra.repository.CassandraRepository; <%_ } _%> import org.springframework.stereotype.Repository; <%_ -if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'neo4j' || databaseType === 'couchbase') { +if (databaseType === 'sql' || databaseType === 'mongodb' || databaseType === 'couchbase') { let importList = fieldsContainOwnerManyToMany; for (r of relationships) { if (r.relationshipType === 'many-to-one' && r.otherEntityName === 'user') { @@ -117,13 +117,6 @@ public interface <%= entityClass %>Repository extends <% if (databaseType === 's @Query("<%- (databaseType === 'mongodb') ? "{'id': ?0}" : "#{#n1ql.selectEntity} USE KEYS $1 WHERE #{#n1ql.filter}" %>") Optional<<%= asEntity(entityClass) %>> findOneWithEagerRelationships(<%= primaryKeyType %> id); <%_ - } else if (databaseType === 'neo4j') { _%> - - @Query("MATCH (n:<%= asEntity(entityClass) %>)<-[]-(m) RETURN n,m") - Page<<%= asEntity(entityClass) %>> findAllWithEagerRelationships(Pageable pageable); - - @Query("MATCH (e:<%= asEntity(entityClass) %> {id: $id}) RETURN e") - Optional<<%= asEntity(entityClass) %>> findOneWithEagerRelationships(<%= primaryKeyType %> id); - <%_ } + } } _%> } diff --git a/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs b/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs index d4d890a3b422..638ee76584ae 100644 --- a/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs +++ b/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs @@ -883,7 +883,7 @@ class <%= entityClass %>ResourceIT <% if (databaseType === 'cassandra') { %>exte if (fields[idx].fieldType === 'ZonedDateTime') { %>)<% } else if (fields[idx].fieldType !== 'String') { %>.toString()<% } %>))<%= !reactive ? ')' : '' %><%_ } _%>; } - <% if (fieldsContainOwnerManyToMany === true) { %> + <% if (fieldsContainOwnerManyToMany === true && databaseType !== 'neo4j') { %> @SuppressWarnings({"unchecked"}) void getAll<%= entityClassPlural %>WithEagerRelationshipsIsEnabled() <% if (!reactive) { %>throws Exception <% } %>{ <%_ if (service !== 'no') { _%> diff --git a/generators/entity/index.js b/generators/entity/index.js index 3e0e80f7fd2a..b81da60cf5f4 100644 --- a/generators/entity/index.js +++ b/generators/entity/index.js @@ -633,7 +633,9 @@ class EntityGenerator extends BaseBlueprintGenerator { (this.context.eagerLoad || (this.context.paginate !== 'pagination' && relationship.relationshipType === 'many-to-many' && - relationship.ownerSide === true)); + relationship.ownerSide === true)) && + // Neo4j eagerly loads relations by default + this.context.databaseType !== 'neo4j'; }); this.context.relationshipsContainEagerLoad = this.context.relationships.some( relationship => relationship.relationshipEagerLoad From 6f2cc0cbe2817f9df3f2947e091abd7f381c613f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 06:31:40 +0000 Subject: [PATCH 0059/1179] chore(deps-dev): bump webpack-bundle-analyzer Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases) - [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v4.1.0...v4.2.0) Signed-off-by: dependabot[bot] --- generators/client/templates/vue/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/templates/vue/package.json b/generators/client/templates/vue/package.json index 34e015c966ab..56f864dd75af 100644 --- a/generators/client/templates/vue/package.json +++ b/generators/client/templates/vue/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "webpack": "4.44.2", - "webpack-bundle-analyzer": "4.1.0", + "webpack-bundle-analyzer": "4.2.0", "vue-jest": "3.0.7", "vue-loader": "15.9.5" } From 540a8d3de7dc7f9c08a33d4c7dd8ef5f898860b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 06:36:07 +0000 Subject: [PATCH 0060/1179] chore(deps-dev): bump eslint-webpack-plugin Bumps [eslint-webpack-plugin](https://github.com/webpack-contrib/eslint-webpack-plugin) from 2.4.0 to 2.4.1. - [Release notes](https://github.com/webpack-contrib/eslint-webpack-plugin/releases) - [Changelog](https://github.com/webpack-contrib/eslint-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/eslint-webpack-plugin/compare/v2.4.0...v2.4.1) Signed-off-by: dependabot[bot] --- generators/client/templates/angular/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/templates/angular/package.json b/generators/client/templates/angular/package.json index c65c1d0675a7..3c213ad645fc 100644 --- a/generators/client/templates/angular/package.json +++ b/generators/client/templates/angular/package.json @@ -27,7 +27,7 @@ "copy-webpack-plugin": "6.3.2", "eslint": "7.14.0", "eslint-config-prettier": "6.15.0", - "eslint-webpack-plugin": "2.4.0", + "eslint-webpack-plugin": "2.4.1", "friendly-errors-webpack-plugin": "1.7.0", "jest": "26.6.3", "jest-date-mock": "1.0.8", From 6cd31c0f75efd7453a66a87babcaace60fbf3236 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 06:41:31 +0000 Subject: [PATCH 0061/1179] chore(deps-dev): bump @typescript-eslint/eslint-plugin Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.8.2 to 4.9.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.9.0/packages/eslint-plugin) Signed-off-by: dependabot[bot] --- generators/client/templates/angular/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/templates/angular/package.json b/generators/client/templates/angular/package.json index c65c1d0675a7..5f3370fdb5e4 100644 --- a/generators/client/templates/angular/package.json +++ b/generators/client/templates/angular/package.json @@ -21,7 +21,7 @@ "@angular-builders/custom-webpack": "11.0.0-beta.1", "@angular-eslint/eslint-plugin": "0.6.0-beta.0", "@types/jest": "26.0.15", - "@typescript-eslint/eslint-plugin": "4.8.2", + "@typescript-eslint/eslint-plugin": "4.9.0", "browser-sync": "2.26.13", "browser-sync-webpack-plugin": "2.2.2", "copy-webpack-plugin": "6.3.2", From 072b48e3bd799c33cc8aec3b55539d12da371ecf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 06:41:55 +0000 Subject: [PATCH 0062/1179] chore(deps-dev): bump cypress in /generators/client/templates/common Bumps [cypress](https://github.com/cypress-io/cypress) from 6.0.0 to 6.0.1. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/.releaserc.base.js) - [Commits](https://github.com/cypress-io/cypress/compare/v6.0.0...v6.0.1) Signed-off-by: dependabot[bot] --- generators/client/templates/common/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/templates/common/package.json b/generators/client/templates/common/package.json index 4ae311303d7d..f2c2586244cc 100644 --- a/generators/client/templates/common/package.json +++ b/generators/client/templates/common/package.json @@ -1,7 +1,7 @@ { "devDependencies": { "concurrently": "5.3.0", - "cypress": "6.0.0", + "cypress": "6.0.1", "typescript": "4.0.5", "wait-on": "5.2.0", "husky": "4.3.0", From d58e6f398daec76d8c35da4a9fa77df2be1d2d91 Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Tue, 1 Dec 2020 06:43:39 +0200 Subject: [PATCH 0063/1179] [angular] follow https://angular.io/guide/styleguide#extract-templates-and-styles-to-their-own-files --- generators/cleanup.js | 7 +++++ generators/client/files-angular.js | 17 ++++++----- .../webapp/app/account/account.module.ts.ejs | 2 +- .../password-strength-bar.component.html.ejs | 28 +++++++++++++++++++ .../password-strength-bar.component.scss.ejs} | 0 .../password-strength-bar.component.ts.ejs | 13 ++------- ...{docs.scss.ejs => docs.component.scss.ejs} | 0 .../app/admin/docs/docs.component.ts.ejs | 2 +- ...{home.scss.ejs => home.component.scss.ejs} | 0 .../webapp/app/home/home.component.ts.ejs | 2 +- ...bar.scss.ejs => navbar.component.scss.ejs} | 0 .../layouts/navbar/navbar.component.ts.ejs | 2 +- ...css.ejs => page-ribbon.component.scss.ejs} | 0 .../profiles/page-ribbon.component.ts.ejs | 2 +- .../alert/alert-error.component.html.ejs | 25 +++++++++++++++++ .../shared/alert/alert-error.component.ts.ejs | 8 +----- .../app/shared/alert/alert.component.html.ejs | 25 +++++++++++++++++ .../app/shared/alert/alert.component.ts.ejs | 8 +----- ...assword-strength-bar.component.spec.ts.ejs | 2 +- test/utils/expected-files.js | 17 ++++++----- 20 files changed, 113 insertions(+), 47 deletions(-) create mode 100644 generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.html.ejs rename generators/client/templates/angular/src/main/webapp/app/account/password/{password-strength-bar.scss.ejs => password-strength-bar/password-strength-bar.component.scss.ejs} (100%) rename generators/client/templates/angular/src/main/webapp/app/account/password/{ => password-strength-bar}/password-strength-bar.component.ts.ejs (86%) rename generators/client/templates/angular/src/main/webapp/app/admin/docs/{docs.scss.ejs => docs.component.scss.ejs} (100%) rename generators/client/templates/angular/src/main/webapp/app/home/{home.scss.ejs => home.component.scss.ejs} (100%) rename generators/client/templates/angular/src/main/webapp/app/layouts/navbar/{navbar.scss.ejs => navbar.component.scss.ejs} (100%) rename generators/client/templates/angular/src/main/webapp/app/layouts/profiles/{page-ribbon.scss.ejs => page-ribbon.component.scss.ejs} (100%) create mode 100644 generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.html.ejs create mode 100644 generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.html.ejs rename generators/client/templates/angular/src/test/javascript/spec/app/account/password/{ => password-strength-bar}/password-strength-bar.component.spec.ts.ejs (97%) diff --git a/generators/cleanup.js b/generators/cleanup.js index 558012ea74d5..1802583e1ed8 100644 --- a/generators/cleanup.js +++ b/generators/cleanup.js @@ -106,6 +106,13 @@ function cleanupOldFiles(generator) { if (generator.isJhipsterVersionLessThan('7.0.0') && generator.jhipsterConfig) { if (generator.jhipsterConfig.clientFramework === ANGULAR) { + generator.removeFile(`${ANGULAR_DIR}account/password/password-strength-bar.component.ts`); + generator.removeFile(`${ANGULAR_DIR}account/password/password-strength-bar.scss`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/account/password/password-strength-bar.component.spec.ts`); + generator.removeFile(`${ANGULAR_DIR}admin/docs/docs.scss`); + generator.removeFile(`${ANGULAR_DIR}home/home.scss`); + generator.removeFile(`${ANGULAR_DIR}layouts/navbar/navbar.scss`); + generator.removeFile(`${ANGULAR_DIR}layouts/profiles/page-ribbon.scss`); generator.removeFile(`${ANGULAR_DIR}admin/audits/audit-data.model.ts`); generator.removeFile(`${ANGULAR_DIR}admin/audits/audit.model.ts`); generator.removeFile(`${ANGULAR_DIR}admin/audits/audits.component.html`); diff --git a/generators/client/files-angular.js b/generators/client/files-angular.js index d3dd1c5f780a..edc99e398dc3 100644 --- a/generators/client/files-angular.js +++ b/generators/client/files-angular.js @@ -114,7 +114,7 @@ const files = { }, { path: ANGULAR_DIR, - templates: ['layouts/profiles/page-ribbon.scss', 'layouts/navbar/navbar.scss', 'home/home.scss'], + templates: ['layouts/profiles/page-ribbon.component.scss', 'layouts/navbar/navbar.component.scss', 'home/home.component.scss'], }, // login { @@ -146,7 +146,9 @@ const files = { { file: 'account/activate/activate.component.html', method: 'processHtml' }, 'account/activate/activate.service.ts', { file: 'account/password/password.route.ts', method: 'processJs' }, - 'account/password/password-strength-bar.component.ts', + 'account/password/password-strength-bar/password-strength-bar.component.ts', + { file: 'account/password/password-strength-bar/password-strength-bar.component.html', method: 'processHtml' }, + 'account/password/password-strength-bar/password-strength-bar.component.scss', 'account/password/password.component.ts', { file: 'account/password/password.component.html', method: 'processHtml' }, 'account/password/password.service.ts', @@ -178,11 +180,6 @@ const files = { 'account/sessions/sessions.service.ts', ], }, - { - condition: generator => !generator.skipUserManagement, - path: ANGULAR_DIR, - templates: ['account/password/password-strength-bar.scss'], - }, ], angularAdminModule: [ { @@ -193,7 +190,7 @@ const files = { { file: 'admin/docs/docs.module.ts', method: 'processJs' }, { file: 'admin/docs/docs.component.ts', method: 'processJs' }, 'admin/docs/docs.component.html', - 'admin/docs/docs.scss', + 'admin/docs/docs.component.scss', ], }, { @@ -365,7 +362,9 @@ const files = { 'shared/item-count.component.ts', // alert service code 'shared/alert/alert.component.ts', + 'shared/alert/alert.component.html', 'shared/alert/alert-error.component.ts', + 'shared/alert/alert-error.component.html', 'shared/alert/alert-error.model.ts', ], }, @@ -447,7 +446,7 @@ const files = { templates: [ 'spec/app/account/activate/activate.component.spec.ts', 'spec/app/account/password/password.component.spec.ts', - 'spec/app/account/password/password-strength-bar.component.spec.ts', + 'spec/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts', 'spec/app/account/password-reset/init/password-reset-init.component.spec.ts', 'spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts', 'spec/app/account/register/register.component.spec.ts', diff --git a/generators/client/templates/angular/src/main/webapp/app/account/account.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/account.module.ts.ejs index 551850843fc1..32425c2ff999 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/account.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/account.module.ts.ejs @@ -23,7 +23,7 @@ import { SharedModule } from 'app/shared/shared.module'; <%_ if (authenticationType === 'session') { _%> import { SessionsComponent } from './sessions/sessions.component'; <%_ } _%> -import { PasswordStrengthBarComponent } from './password/password-strength-bar.component'; +import { PasswordStrengthBarComponent } from './password/password-strength-bar/password-strength-bar.component'; import { RegisterComponent } from './register/register.component'; import { ActivateComponent } from './activate/activate.component'; import { PasswordComponent } from './password/password.component'; diff --git a/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.html.ejs new file mode 100644 index 000000000000..093a3e8b17d5 --- /dev/null +++ b/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.html.ejs @@ -0,0 +1,28 @@ +<%# + Copyright 2013-2020 the original author or authors from the JHipster project. + + 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"); + 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 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-%> +
+ <%= jhiPrefix %>Translate="global.messages.validate.newpassword.strength"<% } %>>Password strength: +
    +
  • +
  • +
  • +
  • +
  • +
+
diff --git a/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar.scss.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.scss.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar.scss.ejs rename to generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.scss.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs similarity index 86% rename from generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar.component.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs index cf07480b8144..78232848b6f2 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs @@ -20,17 +20,8 @@ import { Component, ElementRef, Input, Renderer2 } from '@angular/core'; @Component({ selector: '<%= jhiPrefixDashed %>-password-strength-bar', - template: `
- <%= jhiPrefix %>Translate="global.messages.validate.newpassword.strength"<% } %>>Password strength: -
    -
  • -
  • -
  • -
  • -
  • -
-
`, - styleUrls: ['./password-strength-bar.scss'], + templateUrl: './password-strength-bar.component.html', + styleUrls: ['./password-strength-bar.component.scss'], }) export class PasswordStrengthBarComponent { colors = ['#F00', '#F90', '#FF0', '#9F0', '#0F0']; diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.scss.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.scss.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.scss.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.scss.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.ts.ejs index 72f96ed8b66a..5027db503d88 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.ts.ejs @@ -21,6 +21,6 @@ import { Component } from '@angular/core'; @Component({ selector: '<%= jhiPrefixDashed %>-docs', templateUrl: './docs.component.html', - styleUrls: ['./docs.scss'], + styleUrls: ['./docs.component.scss'], }) export class DocsComponent {} diff --git a/generators/client/templates/angular/src/main/webapp/app/home/home.scss.ejs b/generators/client/templates/angular/src/main/webapp/app/home/home.component.scss.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/home/home.scss.ejs rename to generators/client/templates/angular/src/main/webapp/app/home/home.component.scss.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/home/home.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/home/home.component.ts.ejs index 76e11ed386b8..b0aa25b2a195 100644 --- a/generators/client/templates/angular/src/main/webapp/app/home/home.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/home/home.component.ts.ejs @@ -31,7 +31,7 @@ import { Account } from 'app/core/user/account.model'; @Component({ selector: '<%= jhiPrefixDashed %>-home', templateUrl: './home.component.html', - styleUrls: ['./home.scss'], + styleUrls: ['./home.component.scss'], }) export class HomeComponent implements OnInit<% if (authenticationType !== 'oauth2') { %>, OnDestroy<% } %> { account: Account | null = null; diff --git a/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.scss.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.scss.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.scss.ejs rename to generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.scss.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs index 1c724ac7247f..36564e24d02f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs @@ -34,7 +34,7 @@ import { ProfileService } from 'app/layouts/profiles/profile.service'; @Component({ selector: '<%= jhiPrefixDashed %>-navbar', templateUrl: './navbar.component.html', - styleUrls: ['./navbar.scss'], + styleUrls: ['./navbar.component.scss'], }) export class NavbarComponent implements OnInit { inProduction?: boolean; diff --git a/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.scss.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.scss.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.scss.ejs rename to generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.scss.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs index c6f7a2a10240..b316571bdca9 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs @@ -28,7 +28,7 @@ import { ProfileService } from './profile.service'; <%= jhiPrefix %>Translate="global.ribbon.{{ ribbonEnv }}"<% } %>>{{ ribbonEnv }} `, - styleUrls: ['./page-ribbon.scss'], + styleUrls: ['./page-ribbon.component.scss'], }) export class PageRibbonComponent implements OnInit { ribbonEnv$?: Observable; diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.html.ejs new file mode 100644 index 000000000000..7a72b0110b2a --- /dev/null +++ b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.html.ejs @@ -0,0 +1,25 @@ +<%# + Copyright 2013-2020 the original author or authors from the JHipster project. + + 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"); + 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 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-%> + diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs index 8bb6f489a4dc..0c1e6b33b7db 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs @@ -29,13 +29,7 @@ import { EventManager, EventWithContent } from 'app/core/util/event-manager.serv @Component({ selector: '<%= jhiPrefixDashed %>-alert-error', - template: ` `, + templateUrl: './alert-error.component.html', }) export class AlertErrorComponent implements OnDestroy { alerts: Alert[] = []; diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.html.ejs new file mode 100644 index 000000000000..7a72b0110b2a --- /dev/null +++ b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.html.ejs @@ -0,0 +1,25 @@ +<%# + Copyright 2013-2020 the original author or authors from the JHipster project. + + 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"); + 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 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-%> + diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.ts.ejs index f3d4d6ef1903..f5f78ded6950 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.ts.ejs @@ -22,13 +22,7 @@ import { AlertService, Alert } from 'app/core/util/alert.service'; @Component({ selector: '<%= jhiPrefixDashed %>-alert', - template: ` `, + templateUrl: './alert.component.html', }) export class AlertComponent implements OnInit, OnDestroy { alerts: Alert[] = []; diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/spec/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs similarity index 97% rename from generators/client/templates/angular/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts.ejs rename to generators/client/templates/angular/src/test/javascript/spec/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs index 79333fd7132c..be05aeffb924 100644 --- a/generators/client/templates/angular/src/test/javascript/spec/app/account/password/password-strength-bar.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/spec/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs @@ -18,7 +18,7 @@ -%> import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { PasswordStrengthBarComponent } from 'app/account/password/password-strength-bar.component'; +import { PasswordStrengthBarComponent } from 'app/account/password/password-strength-bar/password-strength-bar.component'; describe('Component Tests', () => { describe('PasswordStrengthBarComponent', () => { diff --git a/test/utils/expected-files.js b/test/utils/expected-files.js index 5e77803c5d07..7606a252da06 100644 --- a/test/utils/expected-files.js +++ b/test/utils/expected-files.js @@ -340,8 +340,9 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/account/password-reset/init/password-reset-init.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/account/password-reset/init/password-reset-init.route.ts`, `${CLIENT_MAIN_SRC_DIR}app/account/password-reset/init/password-reset-init.service.ts`, - `${CLIENT_MAIN_SRC_DIR}app/account/password/password-strength-bar.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/account/password/password-strength-bar.scss`, + `${CLIENT_MAIN_SRC_DIR}app/account/password/password-strength-bar/password-strength-bar.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/account/password/password-strength-bar/password-strength-bar.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/account/password/password-strength-bar/password-strength-bar.component.scss`, `${CLIENT_MAIN_SRC_DIR}app/account/password/password.component.html`, `${CLIENT_MAIN_SRC_DIR}app/account/password/password.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/account/password/password.route.ts`, @@ -368,7 +369,7 @@ const expectedFiles = { `${CLIENT_TEST_SRC_DIR}spec/app/account/activate/activate.component.spec.ts`, `${CLIENT_TEST_SRC_DIR}spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts`, `${CLIENT_TEST_SRC_DIR}spec/app/account/password-reset/init/password-reset-init.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/account/password/password-strength-bar.component.spec.ts`, + `${CLIENT_TEST_SRC_DIR}spec/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts`, `${CLIENT_TEST_SRC_DIR}spec/app/account/password/password.component.spec.ts`, `${CLIENT_TEST_SRC_DIR}spec/app/account/register/register.component.spec.ts`, `${CLIENT_TEST_SRC_DIR}spec/app/account/settings/settings.component.spec.ts`, @@ -402,12 +403,12 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/entities/entity-routing.module.ts`, `${CLIENT_MAIN_SRC_DIR}app/home/home.component.html`, `${CLIENT_MAIN_SRC_DIR}app/home/home.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/home/home.scss`, + `${CLIENT_MAIN_SRC_DIR}app/home/home.component.scss`, `${CLIENT_MAIN_SRC_DIR}app/home/home.module.ts`, `${CLIENT_MAIN_SRC_DIR}app/home/home.route.ts`, `${CLIENT_MAIN_SRC_DIR}app/admin/docs/docs.component.html`, `${CLIENT_MAIN_SRC_DIR}app/admin/docs/docs.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/admin/docs/docs.scss`, + `${CLIENT_MAIN_SRC_DIR}app/admin/docs/docs.component.scss`, `${CLIENT_MAIN_SRC_DIR}app/admin/docs/docs.route.ts`, `${CLIENT_MAIN_SRC_DIR}app/admin/docs/docs.module.ts`, `${CLIENT_MAIN_SRC_DIR}app/login/login.component.html`, @@ -424,18 +425,20 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/layouts/navbar/active-menu.directive.ts`, `${CLIENT_MAIN_SRC_DIR}app/layouts/navbar/navbar.component.html`, `${CLIENT_MAIN_SRC_DIR}app/layouts/navbar/navbar.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/layouts/navbar/navbar.scss`, + `${CLIENT_MAIN_SRC_DIR}app/layouts/navbar/navbar.component.scss`, `${CLIENT_MAIN_SRC_DIR}app/layouts/navbar/navbar.route.ts`, `${CLIENT_MAIN_SRC_DIR}app/layouts/profiles/page-ribbon.component.ts`, - `${CLIENT_MAIN_SRC_DIR}app/layouts/profiles/page-ribbon.scss`, + `${CLIENT_MAIN_SRC_DIR}app/layouts/profiles/page-ribbon.component.scss`, `${CLIENT_MAIN_SRC_DIR}app/layouts/profiles/profile-info.model.ts`, `${CLIENT_MAIN_SRC_DIR}app/layouts/profiles/profile.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/item-count.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/sort/sort.directive.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/sort/sort-by.directive.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/alert/alert-error.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/shared/alert/alert-error.component.html`, `${CLIENT_MAIN_SRC_DIR}app/shared/alert/alert-error.model.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/alert/alert.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/shared/alert/alert.component.html`, `${CLIENT_MAIN_SRC_DIR}app/core/auth/account.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/config/font-awesome-icons.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/has-any-authority.directive.ts`, From 81ecf8a4827afcbba893a3371617db2cd2b24896 Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Tue, 1 Dec 2020 10:25:50 +0200 Subject: [PATCH 0064/1179] [angular] Move health modal component files into modal subfolder --- generators/cleanup.js | 2 ++ generators/client/files-angular.js | 4 ++-- .../src/main/webapp/app/admin/health/health.component.ts.ejs | 2 +- .../src/main/webapp/app/admin/health/health.module.ts.ejs | 2 +- .../admin/health/{ => modal}/health-modal.component.html.ejs | 0 .../admin/health/{ => modal}/health-modal.component.ts.ejs | 2 +- test/utils/expected-files.js | 4 ++-- 7 files changed, 9 insertions(+), 7 deletions(-) rename generators/client/templates/angular/src/main/webapp/app/admin/health/{ => modal}/health-modal.component.html.ejs (100%) rename generators/client/templates/angular/src/main/webapp/app/admin/health/{ => modal}/health-modal.component.ts.ejs (96%) diff --git a/generators/cleanup.js b/generators/cleanup.js index 558012ea74d5..eb4fa5d1b550 100644 --- a/generators/cleanup.js +++ b/generators/cleanup.js @@ -113,6 +113,8 @@ function cleanupOldFiles(generator) { generator.removeFile(`${ANGULAR_DIR}admin/audits/audits.route.ts`); generator.removeFile(`${ANGULAR_DIR}admin/audits/audits.module.ts`); generator.removeFile(`${ANGULAR_DIR}admin/audits/audits.service.ts`); + generator.removeFile(`${ANGULAR_DIR}admin/health/health-modal.component.ts`); + generator.removeFile(`${ANGULAR_DIR}admin/health/health-modal.component.html`); generator.removeFile(`${ANGULAR_DIR}admin/user-management/user-management-delete-dialog.component.ts`); generator.removeFile(`${ANGULAR_DIR}admin/user-management/user-management-delete-dialog.component.html`); generator.removeFile(`${ANGULAR_DIR}admin/user-management/user-management-detail.component.ts`); diff --git a/generators/client/files-angular.js b/generators/client/files-angular.js index d3dd1c5f780a..b84156b82698 100644 --- a/generators/client/files-angular.js +++ b/generators/client/files-angular.js @@ -211,8 +211,8 @@ const files = { 'admin/health/health.module.ts', 'admin/health/health.component.ts', { file: 'admin/health/health.component.html', method: 'processHtml' }, - 'admin/health/health-modal.component.ts', - { file: 'admin/health/health-modal.component.html', method: 'processHtml' }, + 'admin/health/modal/health-modal.component.ts', + { file: 'admin/health/modal/health-modal.component.html', method: 'processHtml' }, 'admin/health/health.service.ts', 'admin/health/health.model.ts', { file: 'admin/logs/logs.route.ts', method: 'processJs' }, diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.ts.ejs index bf7237ed48a7..8355e7bcda7f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.ts.ejs @@ -22,7 +22,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { HealthService } from './health.service'; import { Health, HealthDetails, HealthStatus } from './health.model'; -import { HealthModalComponent } from './health-modal.component'; +import { HealthModalComponent } from './modal/health-modal.component'; @Component({ selector: '<%= jhiPrefixDashed %>-health', diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/health/health.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.module.ts.ejs index 80ab0fb138a9..ec8ea5cf9443 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/health/health.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.module.ts.ejs @@ -21,7 +21,7 @@ import { RouterModule } from '@angular/router'; import { SharedModule } from 'app/shared/shared.module'; import { HealthComponent } from './health.component'; -import { HealthModalComponent } from './health-modal.component'; +import { HealthModalComponent } from './modal/health-modal.component'; import { healthRoute } from './health.route'; @NgModule({ diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/health/health-modal.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.html.ejs similarity index 100% rename from generators/client/templates/angular/src/main/webapp/app/admin/health/health-modal.component.html.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.html.ejs diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/health/health-modal.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.ts.ejs similarity index 96% rename from generators/client/templates/angular/src/main/webapp/app/admin/health/health-modal.component.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.ts.ejs index 0fa5796bc900..c4e948354502 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/health/health-modal.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.ts.ejs @@ -19,7 +19,7 @@ import { Component } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { HealthKey, HealthDetails } from './health.model'; +import { HealthKey, HealthDetails } from '../health.model'; @Component({ selector: '<%= jhiPrefixDashed %>-health-modal', diff --git a/test/utils/expected-files.js b/test/utils/expected-files.js index 5e77803c5d07..e998f744c4e9 100644 --- a/test/utils/expected-files.js +++ b/test/utils/expected-files.js @@ -533,8 +533,8 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/admin/configuration/configuration.module.ts`, `${CLIENT_MAIN_SRC_DIR}app/admin/configuration/configuration.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/admin/configuration/configuration.model.ts`, - `${CLIENT_MAIN_SRC_DIR}app/admin/health/health-modal.component.html`, - `${CLIENT_MAIN_SRC_DIR}app/admin/health/health-modal.component.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/health/modal/health-modal.component.html`, + `${CLIENT_MAIN_SRC_DIR}app/admin/health/modal/health-modal.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/admin/health/health.component.html`, `${CLIENT_MAIN_SRC_DIR}app/admin/health/health.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/admin/health/health.route.ts`, From a143cd3ef2966fc8c890c5f9119e404631f2952d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Dec 2020 08:49:37 +0000 Subject: [PATCH 0065/1179] chore(deps-dev): bump webpack-bundle-analyzer Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases) - [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v4.1.0...v4.2.0) Signed-off-by: dependabot[bot] --- generators/client/templates/angular/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/templates/angular/package.json b/generators/client/templates/angular/package.json index 3c213ad645fc..e56057256e3d 100644 --- a/generators/client/templates/angular/package.json +++ b/generators/client/templates/angular/package.json @@ -36,7 +36,7 @@ "merge-jsons-webpack-plugin": "1.0.21", "rimraf": "3.0.2", "simple-progress-webpack-plugin": "1.1.2", - "webpack-bundle-analyzer": "4.1.0", + "webpack-bundle-analyzer": "4.2.0", "webpack-notifier": "1.11.0" } } From 4e904f587727b3c0f445dd3e476ea396e0dc8357 Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Tue, 1 Dec 2020 12:07:49 +0200 Subject: [PATCH 0066/1179] Move tests next to files they are testing in Angular --- generators/cleanup.js | 19 +-- generators/client/files-angular.js | 90 ++++++------ .../client/templates/angular/angular.json.ejs | 15 +- .../test/javascript => }/jest.conf.js.ejs | 5 +- .../client/templates/angular/package.json.ejs | 2 +- .../activate/activate.component.spec.ts.ejs | 0 ...assword-reset-finish.component.spec.ts.ejs | 0 .../password-reset-init.component.spec.ts.ejs | 0 ...assword-strength-bar.component.spec.ts.ejs | 0 .../password/password.component.spec.ts.ejs | 0 .../register/register.component.spec.ts.ejs | 0 .../sessions/sessions.component.spec.ts.ejs | 0 .../settings/settings.component.spec.ts.ejs | 0 .../configuration.component.spec.ts.ejs | 0 .../configuration.service.spec.ts.ejs | 0 .../admin/health/health.component.spec.ts.ejs | 0 .../app/admin/logs/logs.component.spec.ts.ejs | 0 .../app/admin/logs/logs.service.spec.ts.ejs | 0 .../metrics/metrics.component.spec.ts.ejs | 0 .../admin/metrics/metrics.service.spec.ts.ejs | 0 ...gement-delete-dialog.component.spec.ts.ejs | 0 ...er-management-detail.component.spec.ts.ejs | 0 .../user-management.component.spec.ts.ejs | 0 ...er-management-update.component.spec.ts.ejs | 0 .../app/core/auth/account.service.spec.ts.ejs | 0 .../app/core/user/user.service.spec.ts.ejs | 0 .../app/core/util/alert.service.spec.ts.ejs | 0 .../core/util/data-util.service.spec.ts.ejs | 0 .../util/event-manager.service.spec.ts.ejs | 0 .../core/util/parse-links.service.spec.ts.ejs | 0 .../app/home/home.component.spec.ts.ejs | 0 .../layouts/main/main.component.spec.ts.ejs | 0 .../navbar/navbar.component.spec.ts.ejs | 0 .../app/login/login.component.spec.ts.ejs | 0 .../alert/alert-error.component.spec.ts.ejs | 0 .../shared/alert/alert.component.spec.ts.ejs | 0 .../date/format-medium-date.pipe.spec.ts.ejs | 0 .../format-medium-datetime.pipe.spec.ts.ejs | 0 .../shared/item-count.component.spec.ts.ejs | 0 .../language/translate.directive.spec.ts.ejs | 0 .../shared/sort/sort-by.directive.spec.ts.ejs | 0 .../shared/sort/sort.directive.spec.ts.ejs | 0 .../client/templates/common/.eslintignore.ejs | 2 +- generators/entity-client/files.js | 25 ++-- generators/entity-client/index.js | 12 -- ...gement-delete-dialog.component.spec.ts.ejs | 0 ...ty-management-detail.component.spec.ts.ejs | 0 .../entity-management.service.spec.ts.ejs | 0 .../entity-management.component.spec.ts.ejs | 0 ...ty-management-update.component.spec.ts.ejs | 0 test/utils/expected-files.js | 136 +++++++++--------- 51 files changed, 132 insertions(+), 174 deletions(-) rename generators/client/templates/angular/{src/test/javascript => }/jest.conf.js.ejs (91%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/account/activate/activate.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/account/password/password.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/account/register/register.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/account/sessions/sessions.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/account/settings/settings.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/admin/configuration/configuration.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/admin/configuration/configuration.service.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/admin/health/health.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/admin/logs/logs.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/admin/logs/logs.service.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/admin/metrics/metrics.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/admin/metrics/metrics.service.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/admin/user-management/list/user-management.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/admin/user-management/update/user-management-update.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/core/auth/account.service.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/core/user/user.service.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/core/util/alert.service.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/core/util/data-util.service.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/core/util/event-manager.service.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/core/util/parse-links.service.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/home/home.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/layouts/main/main.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/layouts/navbar/navbar.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/login/login.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/shared/alert/alert-error.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/shared/alert/alert.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/shared/date/format-medium-date.pipe.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/shared/date/format-medium-datetime.pipe.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/shared/item-count.component.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/shared/language/translate.directive.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/shared/sort/sort-by.directive.spec.ts.ejs (100%) rename generators/client/templates/angular/src/{test/javascript/spec => main/webapp}/app/shared/sort/sort.directive.spec.ts.ejs (100%) rename generators/entity-client/templates/angular/src/{test/javascript/spec => main/webapp}/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs (100%) rename generators/entity-client/templates/angular/src/{test/javascript/spec => main/webapp}/app/entities/detail/entity-management-detail.component.spec.ts.ejs (100%) rename generators/entity-client/templates/angular/src/{test/javascript/spec => main/webapp}/app/entities/entity-management.service.spec.ts.ejs (100%) rename generators/entity-client/templates/angular/src/{test/javascript/spec => main/webapp}/app/entities/list/entity-management.component.spec.ts.ejs (100%) rename generators/entity-client/templates/angular/src/{test/javascript/spec => main/webapp}/app/entities/update/entity-management-update.component.spec.ts.ejs (100%) diff --git a/generators/cleanup.js b/generators/cleanup.js index ca571457d162..9a7155be8e9f 100644 --- a/generators/cleanup.js +++ b/generators/cleanup.js @@ -108,7 +108,6 @@ function cleanupOldFiles(generator) { if (generator.jhipsterConfig.clientFramework === ANGULAR) { generator.removeFile(`${ANGULAR_DIR}account/password/password-strength-bar.component.ts`); generator.removeFile(`${ANGULAR_DIR}account/password/password-strength-bar.scss`); - generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/account/password/password-strength-bar.component.spec.ts`); generator.removeFile(`${ANGULAR_DIR}admin/docs/docs.scss`); generator.removeFile(`${ANGULAR_DIR}home/home.scss`); generator.removeFile(`${ANGULAR_DIR}layouts/navbar/navbar.scss`); @@ -130,10 +129,6 @@ function cleanupOldFiles(generator) { generator.removeFile(`${ANGULAR_DIR}admin/user-management/user-management.component.html`); generator.removeFile(`${ANGULAR_DIR}admin/user-management/user-management-update.component.ts`); generator.removeFile(`${ANGULAR_DIR}admin/user-management/user-management-update.component.html`); - generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts`); - generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/user-management-detail.component.spec.ts`); - generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/user-management.component.spec.ts`); - generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/user-management-update.component.spec.ts`); generator.removeFile(`${ANGULAR_DIR}entities/entity.module.ts`); generator.removeFile(`${ANGULAR_DIR}shared/util/datepicker-adapter.ts`); generator.removeFile(`${ANGULAR_DIR}shared/login/login.component.ts`); @@ -161,27 +156,17 @@ function cleanupOldFiles(generator) { generator.removeFile('tsconfig.base.json'); generator.removeFile('postcss.config.js'); generator.removeFile('proxy.conf.json'); - generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/core/login/login-modal.component.spec.ts`); - generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/core/login/login-modal.service.spec.ts`); - generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/core/user/account.service.spec.ts`); - generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/audits/audits.component.spec.ts`); - generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/audits/audits.service.spec.ts`); - generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/shared/login/login.component.spec.ts`); - generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/test.module.ts`); - generator.removeFile(`${CLIENT_TEST_SRC_DIR}jest.ts`); - generator.removeFile(`${CLIENT_TEST_SRC_DIR}jest-global-mocks.ts`); - generator.removeFolder(`${CLIENT_TEST_SRC_DIR}spec/helpers`); + generator.removeFolder(`${CLIENT_TEST_SRC_DIR}spec`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}jest.conf.js`); generator.removeFile('tslint.json'); // unreleased files and folders cleanup for v7 developers generator.removeFile(`${ANGULAR_DIR}shared/duration.pipe.ts`); generator.removeFile(`${ANGULAR_DIR}shared/find-language-from-key.pipe.ts`); generator.removeFile(`${ANGULAR_DIR}shared/translate.directive.ts`); - generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/shared/translate.directive.spec.ts`); generator.removeFile(`${ANGULAR_DIR}core/user/authority.model.ts`); generator.removeFolder(`${ANGULAR_DIR}core/config`); generator.removeFolder(`${ANGULAR_DIR}core/event-manager`); - generator.removeFolder(`${CLIENT_TEST_SRC_DIR}spec/app/core/event-manager`); generator.removeFolder(`${ANGULAR_DIR}admin/metrics/jvm-memory`); generator.removeFolder(`${ANGULAR_DIR}admin/metrics/jvm-threads`); generator.removeFolder(`${ANGULAR_DIR}admin/metrics/metrics-cache`); diff --git a/generators/client/files-angular.js b/generators/client/files-angular.js index 0972e3b4a435..edabe5e037a8 100644 --- a/generators/client/files-angular.js +++ b/generators/client/files-angular.js @@ -33,6 +33,7 @@ const files = { 'tsconfig.json', 'tsconfig.app.json', 'tsconfig.spec.json', + 'jest.conf.js', '.eslintrc.json', 'angular.json', 'ngsw-config.json', @@ -403,77 +404,76 @@ const files = { clientTestFw: [ { condition: generator => generator.withAdminUi, - path: CLIENT_TEST_SRC_DIR, + path: ANGULAR_DIR, templates: [ - 'spec/app/admin/configuration/configuration.component.spec.ts', - 'spec/app/admin/configuration/configuration.service.spec.ts', - 'spec/app/admin/health/health.component.spec.ts', - 'spec/app/admin/logs/logs.component.spec.ts', - 'spec/app/admin/logs/logs.service.spec.ts', - 'spec/app/admin/metrics/metrics.component.spec.ts', - 'spec/app/admin/metrics/metrics.service.spec.ts', + 'admin/configuration/configuration.component.spec.ts', + 'admin/configuration/configuration.service.spec.ts', + 'admin/health/health.component.spec.ts', + 'admin/logs/logs.component.spec.ts', + 'admin/logs/logs.service.spec.ts', + 'admin/metrics/metrics.component.spec.ts', + 'admin/metrics/metrics.service.spec.ts', ], }, { - path: CLIENT_TEST_SRC_DIR, + path: ANGULAR_DIR, templates: [ - 'jest.conf.js', - 'spec/app/core/auth/account.service.spec.ts', - 'spec/app/core/util/event-manager.service.spec.ts', - 'spec/app/core/util/data-util.service.spec.ts', - 'spec/app/core/util/parse-links.service.spec.ts', - 'spec/app/core/util/alert.service.spec.ts', - 'spec/app/home/home.component.spec.ts', - 'spec/app/layouts/main/main.component.spec.ts', - 'spec/app/layouts/navbar/navbar.component.spec.ts', - 'spec/app/shared/alert/alert.component.spec.ts', - 'spec/app/shared/alert/alert-error.component.spec.ts', - 'spec/app/shared/date/format-medium-date.pipe.spec.ts', - 'spec/app/shared/date/format-medium-datetime.pipe.spec.ts', - 'spec/app/shared/sort/sort.directive.spec.ts', - 'spec/app/shared/sort/sort-by.directive.spec.ts', - 'spec/app/shared/item-count.component.spec.ts', + 'core/auth/account.service.spec.ts', + 'core/util/event-manager.service.spec.ts', + 'core/util/data-util.service.spec.ts', + 'core/util/parse-links.service.spec.ts', + 'core/util/alert.service.spec.ts', + 'home/home.component.spec.ts', + 'layouts/main/main.component.spec.ts', + 'layouts/navbar/navbar.component.spec.ts', + 'shared/alert/alert.component.spec.ts', + 'shared/alert/alert-error.component.spec.ts', + 'shared/date/format-medium-date.pipe.spec.ts', + 'shared/date/format-medium-datetime.pipe.spec.ts', + 'shared/sort/sort.directive.spec.ts', + 'shared/sort/sort-by.directive.spec.ts', + 'shared/item-count.component.spec.ts', ], }, { condition: generator => generator.enableTranslation, - path: CLIENT_TEST_SRC_DIR, - templates: ['spec/app/shared/language/translate.directive.spec.ts'], + path: ANGULAR_DIR, + templates: ['shared/language/translate.directive.spec.ts'], }, { condition: generator => !generator.skipUserManagement, - path: CLIENT_TEST_SRC_DIR, + path: ANGULAR_DIR, templates: [ - 'spec/app/account/activate/activate.component.spec.ts', - 'spec/app/account/password/password.component.spec.ts', - 'spec/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts', - 'spec/app/account/password-reset/init/password-reset-init.component.spec.ts', - 'spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts', - 'spec/app/account/register/register.component.spec.ts', - 'spec/app/account/settings/settings.component.spec.ts', + 'account/activate/activate.component.spec.ts', + 'account/password/password.component.spec.ts', + 'account/password/password-strength-bar/password-strength-bar.component.spec.ts', + 'account/password-reset/init/password-reset-init.component.spec.ts', + 'account/password-reset/finish/password-reset-finish.component.spec.ts', + 'account/register/register.component.spec.ts', + 'account/settings/settings.component.spec.ts', ], }, { condition: generator => generator.authenticationType !== 'oauth2', - path: CLIENT_TEST_SRC_DIR, - templates: ['spec/app/login/login.component.spec.ts'], + path: ANGULAR_DIR, + templates: ['login/login.component.spec.ts'], }, { condition: generator => !generator.skipUserManagement, - path: CLIENT_TEST_SRC_DIR, + path: ANGULAR_DIR, templates: [ - 'spec/app/admin/user-management/list/user-management.component.spec.ts', - 'spec/app/admin/user-management/detail/user-management-detail.component.spec.ts', - 'spec/app/admin/user-management/update/user-management-update.component.spec.ts', - 'spec/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts', + 'admin/user-management/list/user-management.component.spec.ts', + 'admin/user-management/detail/user-management-detail.component.spec.ts', + 'admin/user-management/update/user-management-update.component.spec.ts', + 'admin/user-management/delete/user-management-delete-dialog.component.spec.ts', // user service tests - 'spec/app/core/user/user.service.spec.ts', + 'core/user/user.service.spec.ts', ], }, { condition: generator => generator.authenticationType === 'session' && !generator.skipUserManagement, - path: CLIENT_TEST_SRC_DIR, - templates: ['spec/app/account/sessions/sessions.component.spec.ts'], + path: ANGULAR_DIR, + templates: ['account/sessions/sessions.component.spec.ts'], }, { condition: generator => generator.protractorTests, diff --git a/generators/client/templates/angular/angular.json.ejs b/generators/client/templates/angular/angular.json.ejs index 9f0b33955686..888a06772dbc 100644 --- a/generators/client/templates/angular/angular.json.ejs +++ b/generators/client/templates/angular/angular.json.ejs @@ -90,27 +90,14 @@ "test": { "builder": "@angular-builders/jest:run", "options": { - "configPath": "<%= CLIENT_TEST_SRC_DIR %>jest.conf.js" + "configPath": "jest.conf.js" } } }, "schematics": { "@schematics/angular:component": { - "skipTests": true, "style": "scss" }, - "@schematics/angular:directive": { - "skipTests": true - }, - "@schematics/angular:guard": { - "skipTests": true - }, - "@schematics/angular:pipe": { - "skipTests": true - }, - "@schematics/angular:service": { - "skipTests": true - }, "@schematics/angular:application": { "strict": true } diff --git a/generators/client/templates/angular/src/test/javascript/jest.conf.js.ejs b/generators/client/templates/angular/jest.conf.js.ejs similarity index 91% rename from generators/client/templates/angular/src/test/javascript/jest.conf.js.ejs rename to generators/client/templates/angular/jest.conf.js.ejs index c286e245446b..08814323ed91 100644 --- a/generators/client/templates/angular/src/test/javascript/jest.conf.js.ejs +++ b/generators/client/templates/angular/jest.conf.js.ejs @@ -16,17 +16,16 @@ See the License for the specific language governing permissions and limitations under the License. -%> -const tsconfig = require('../../../tsconfig.json'); +const tsconfig = require('./tsconfig.json'); module.exports = { setupFiles: ['jest-date-mock'], cacheDirectory: '/<%= BUILD_DIR %>jest-cache', coverageDirectory: '/<%= BUILD_DIR %>test-results/', - coveragePathIgnorePatterns: ['/<%= CLIENT_TEST_SRC_DIR %>'], moduleNameMapper: mapTypescriptAliasToJestAlias(), reporters: ['default', ['jest-junit', { outputDirectory: './<%= BUILD_DIR %>test-results/', outputName: 'TESTS-results-jest.xml' }]], testResultsProcessor: 'jest-sonar-reporter', - testMatch: ['/<%= CLIENT_TEST_SRC_DIR %>spec/**/@(*.)@(spec.ts)'], + testMatch: ['/<%= CLIENT_MAIN_SRC_DIR %>app/**/@(*.)@(spec.ts)'], testURL: 'http://localhost/', }; diff --git a/generators/client/templates/angular/package.json.ejs b/generators/client/templates/angular/package.json.ejs index 2885b2249d2a..a9d4ee7f0425 100644 --- a/generators/client/templates/angular/package.json.ejs +++ b/generators/client/templates/angular/package.json.ejs @@ -161,7 +161,7 @@ limitations under the License. "postinstall": "<%= clientPackageManager %> run e2e:update-webdriver", "e2e:update-webdriver": "webdriver-manager update --gecko false", <%_ } _%> - "jest": "jest --coverage --logHeapUsage --maxWorkers=2 --config <%= CLIENT_TEST_SRC_DIR %>jest.conf.js", + "jest": "jest --coverage --logHeapUsage --maxWorkers=2 --config jest.conf.js", "start": "<%= clientPackageManager %> run webpack:dev", "start-hmr": "ng serve --hmr", "start-tls": "<%= clientPackageManager %> run webpack:dev -- --env.tls", diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/account/activate/activate.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/account/activate/activate.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/account/password/password.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/account/password/password.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/account/password/password.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/account/register/register.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/account/register/register.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/account/register/register.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/account/sessions/sessions.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/account/sessions/sessions.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/account/settings/settings.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/account/settings/settings.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/admin/configuration/configuration.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/admin/configuration/configuration.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/admin/configuration/configuration.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/admin/configuration/configuration.service.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/admin/health/health.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/admin/health/health.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/admin/logs/logs.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/admin/logs/logs.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/admin/logs/logs.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/admin/logs/logs.service.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/admin/metrics/metrics.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/admin/metrics/metrics.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/admin/metrics/metrics.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/admin/metrics/metrics.service.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/list/user-management.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/list/user-management.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/update/user-management-update.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/admin/user-management/update/user-management-update.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/core/auth/account.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/core/auth/account.service.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/core/user/user.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/user/user.service.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/core/user/user.service.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/core/user/user.service.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/core/util/alert.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/util/alert.service.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/core/util/alert.service.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/core/util/alert.service.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/core/util/data-util.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/core/util/data-util.service.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/core/util/event-manager.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/core/util/event-manager.service.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/core/util/parse-links.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/core/util/parse-links.service.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/home/home.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/home/home.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/layouts/main/main.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/layouts/main/main.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/layouts/navbar/navbar.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/layouts/navbar/navbar.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/login/login.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/login/login.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/shared/alert/alert-error.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/shared/alert/alert-error.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/shared/alert/alert.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/shared/alert/alert.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/shared/date/format-medium-date.pipe.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/shared/date/format-medium-date.pipe.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/shared/date/format-medium-datetime.pipe.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/shared/date/format-medium-datetime.pipe.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/shared/item-count.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/item-count.component.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/shared/item-count.component.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/shared/item-count.component.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/shared/language/translate.directive.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/shared/language/translate.directive.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/shared/sort/sort-by.directive.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/shared/sort/sort-by.directive.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.ejs diff --git a/generators/client/templates/angular/src/test/javascript/spec/app/shared/sort/sort.directive.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort.directive.spec.ts.ejs similarity index 100% rename from generators/client/templates/angular/src/test/javascript/spec/app/shared/sort/sort.directive.spec.ts.ejs rename to generators/client/templates/angular/src/main/webapp/app/shared/sort/sort.directive.spec.ts.ejs diff --git a/generators/client/templates/common/.eslintignore.ejs b/generators/client/templates/common/.eslintignore.ejs index b889782aff87..965183b0c3d5 100644 --- a/generators/client/templates/common/.eslintignore.ejs +++ b/generators/client/templates/common/.eslintignore.ejs @@ -24,7 +24,7 @@ src/main/docker/ <%_ if (protractorTests) { _%> <%= CLIENT_TEST_SRC_DIR %>protractor.conf.js <%_ } _%> -<%= CLIENT_TEST_SRC_DIR %>jest.conf.js +<%= clientFramework === ANGULAR ? '' : CLIENT_TEST_SRC_DIR %>jest.conf.js webpack/ target/ build/ diff --git a/generators/entity-client/files.js b/generators/entity-client/files.js index 7df0689d68d0..6ea05fce7066 100644 --- a/generators/entity-client/files.js +++ b/generators/entity-client/files.js @@ -122,37 +122,36 @@ const angularFiles = { test: [ { condition: generator => !generator.embedded, - path: CLIENT_TEST_SRC_DIR, + path: ANGULAR_DIR, templates: [ { - file: 'spec/app/entities/detail/entity-management-detail.component.spec.ts', + file: 'entities/detail/entity-management-detail.component.spec.ts', renameTo: generator => - `spec/app/entities/${generator.entityFolderName}/detail/${generator.entityFileName}-detail.component.spec.ts`, + `entities/${generator.entityFolderName}/detail/${generator.entityFileName}-detail.component.spec.ts`, }, { - file: 'spec/app/entities/list/entity-management.component.spec.ts', - renameTo: generator => - `spec/app/entities/${generator.entityFolderName}/list/${generator.entityFileName}.component.spec.ts`, + file: 'entities/list/entity-management.component.spec.ts', + renameTo: generator => `entities/${generator.entityFolderName}/list/${generator.entityFileName}.component.spec.ts`, }, { - file: 'spec/app/entities/entity-management.service.spec.ts', - renameTo: generator => `spec/app/entities/${generator.entityFolderName}/${generator.entityFileName}.service.spec.ts`, + file: 'entities/entity-management.service.spec.ts', + renameTo: generator => `entities/${generator.entityFolderName}/${generator.entityFileName}.service.spec.ts`, }, ], }, { condition: generator => !generator.readOnly && !generator.embedded, - path: CLIENT_TEST_SRC_DIR, + path: ANGULAR_DIR, templates: [ { - file: 'spec/app/entities/update/entity-management-update.component.spec.ts', + file: 'entities/update/entity-management-update.component.spec.ts', renameTo: generator => - `spec/app/entities/${generator.entityFolderName}/update/${generator.entityFileName}-update.component.spec.ts`, + `entities/${generator.entityFolderName}/update/${generator.entityFileName}-update.component.spec.ts`, }, { - file: 'spec/app/entities/delete/entity-management-delete-dialog.component.spec.ts', + file: 'entities/delete/entity-management-delete-dialog.component.spec.ts', renameTo: generator => - `spec/app/entities/${generator.entityFolderName}/delete/${generator.entityFileName}-delete-dialog.component.spec.ts`, + `entities/${generator.entityFolderName}/delete/${generator.entityFileName}-delete-dialog.component.spec.ts`, }, ], }, diff --git a/generators/entity-client/index.js b/generators/entity-client/index.js index f61128070571..1a5274885181 100644 --- a/generators/entity-client/index.js +++ b/generators/entity-client/index.js @@ -96,18 +96,6 @@ module.exports = class extends BaseBlueprintGenerator { this.removeFile( `${this.CLIENT_MAIN_SRC_DIR}/app/entities/${this.entityFolderName}/${this.entityFileName}-update.component.html` ); - this.removeFile( - `${this.CLIENT_TEST_SRC_DIR}/spec/app/entities/${this.entityFolderName}/${this.entityFileName}.component.spec.ts` - ); - this.removeFile( - `${this.CLIENT_TEST_SRC_DIR}/spec/app/entities/${this.entityFolderName}/${this.entityFileName}-detail.component.spec.ts` - ); - this.removeFile( - `${this.CLIENT_TEST_SRC_DIR}/spec/app/entities/${this.entityFolderName}/${this.entityFileName}-delete-dialog.component.spec.ts` - ); - this.removeFile( - `${this.CLIENT_TEST_SRC_DIR}/spec/app/entities/${this.entityFolderName}/${this.entityFileName}-update.component.spec.ts` - ); } }, ...writeFiles(), diff --git a/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs similarity index 100% rename from generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs rename to generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs diff --git a/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/detail/entity-management-detail.component.spec.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.spec.ts.ejs similarity index 100% rename from generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/detail/entity-management-detail.component.spec.ts.ejs rename to generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.spec.ts.ejs diff --git a/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/entity-management.service.spec.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.service.spec.ts.ejs similarity index 100% rename from generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/entity-management.service.spec.ts.ejs rename to generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.service.spec.ts.ejs diff --git a/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/list/entity-management.component.spec.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.spec.ts.ejs similarity index 100% rename from generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/list/entity-management.component.spec.ts.ejs rename to generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.spec.ts.ejs diff --git a/generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/update/entity-management-update.component.spec.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.spec.ts.ejs similarity index 100% rename from generators/entity-client/templates/angular/src/test/javascript/spec/app/entities/update/entity-management-update.component.spec.ts.ejs rename to generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.spec.ts.ejs diff --git a/test/utils/expected-files.js b/test/utils/expected-files.js index c113c6eef94f..158521de8f8e 100644 --- a/test/utils/expected-files.js +++ b/test/utils/expected-files.js @@ -26,11 +26,11 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/entities/foo/detail/foo-detail.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/entities/foo/foo.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/model/foo.model.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo/delete/foo-delete-dialog.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo/detail/foo-detail.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo/update/foo-update.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo/list/foo.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo/foo.service.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo/delete/foo-delete-dialog.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo/detail/foo-detail.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo/update/foo-update.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo/list/foo.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo/foo.service.spec.ts`, ], clientNg2WithSuffix: [ `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/list/foo-management.component.html`, @@ -45,11 +45,11 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/detail/foo-management-detail.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/foo-management.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/model/foo-management.model.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo-management/delete/foo-management-delete-dialog.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo-management/detail/foo-management-detail.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo-management/update/foo-management-update.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo-management/list/foo-management.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/foo-management/foo-management.service.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/delete/foo-management-delete-dialog.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/detail/foo-management-detail.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/update/foo-management-update.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/list/foo-management.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/foo-management/foo-management.service.spec.ts`, ], clientNg2WithRootFolder: [ `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/list/foo.component.html`, @@ -64,11 +64,11 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/detail/foo-detail.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/foo.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/model/test-root/foo.model.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo/delete/foo-delete-dialog.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo/detail/foo-detail.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo/update/foo-update.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo/list/foo.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo/foo.service.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/delete/foo-delete-dialog.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/detail/foo-detail.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/update/foo-update.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/list/foo.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo/foo.service.spec.ts`, ], clientNg2WithRootFolderAndSuffix: [ `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/list/foo-management.component.html`, @@ -83,11 +83,11 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/detail/foo-management-detail.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/foo-management.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/model/test-root/foo-management.model.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo-management/delete/foo-management-delete-dialog.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo-management/detail/foo-management-detail.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo-management/update/foo-management-update.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo-management/list/foo-management.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/test-root/foo-management/foo-management.service.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/delete/foo-management-delete-dialog.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/detail/foo-management-detail.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/update/foo-management-update.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/list/foo-management.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/test-root/foo-management/foo-management.service.spec.ts`, ], clientNg2GatewayMicroserviceEntity: [ `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/list/bar.component.html`, @@ -102,11 +102,11 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/detail/bar-detail.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/bar.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/model/sampleMicroservice/bar.model.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/bar/delete/bar-delete-dialog.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/bar/detail/bar-detail.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/bar/update/bar-update.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/bar/list/bar.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/bar/bar.service.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/delete/bar-delete-dialog.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/detail/bar-detail.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/update/bar-update.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/list/bar.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/bar/bar.service.spec.ts`, ], clientBazGatewayMicroserviceEntity: [ `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/list/baz.component.html`, @@ -121,11 +121,11 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/detail/baz-detail.component.ts`, `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/baz.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/shared/model/sampleMicroservice/baz.model.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/baz/delete/baz-delete-dialog.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/baz/detail/baz-detail.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/baz/update/baz-update.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/baz/list/baz.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/entities/sampleMicroservice/baz/baz.service.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/delete/baz-delete-dialog.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/detail/baz-detail.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/update/baz-update.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/list/baz.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/entities/sampleMicroservice/baz/baz.service.spec.ts`, ], server: [ '.jhipster/Foo.json', @@ -366,18 +366,18 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/user-management.route.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/user/user.model.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/user/user.service.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/account/activate/activate.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/account/password-reset/init/password-reset-init.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/account/password/password.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/account/register/register.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/account/settings/settings.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/detail/user-management-detail.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/update/user-management-update.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/list/user-management.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/core/user/user.service.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/account/activate/activate.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/account/password-reset/finish/password-reset-finish.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/account/password-reset/init/password-reset-init.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/account/password/password-strength-bar/password-strength-bar.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/account/password/password.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/account/register/register.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/account/settings/settings.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/detail/user-management-detail.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/update/user-management-update.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/user-management/list/user-management.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/core/user/user.service.spec.ts`, ], client: [ @@ -477,24 +477,24 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}robots.txt`, `${CLIENT_MAIN_SRC_DIR}swagger-ui/dist/images/throbber.gif`, `${CLIENT_MAIN_SRC_DIR}swagger-ui/index.html`, - `${CLIENT_TEST_SRC_DIR}jest.conf.js`, - `${CLIENT_TEST_SRC_DIR}spec/app/core/auth/account.service.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/core/util/event-manager.service.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/core/util/data-util.service.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/core/util/parse-links.service.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/core/util/alert.service.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/home/home.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/login/login.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/layouts/main/main.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/layouts/navbar/navbar.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/shared/item-count.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/shared/alert/alert.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/shared/alert/alert-error.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/shared/date/format-medium-date.pipe.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/shared/date/format-medium-datetime.pipe.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/shared/sort/sort.directive.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/shared/sort/sort-by.directive.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/shared/language/translate.directive.spec.ts`, + 'jest.conf.js', + `${CLIENT_MAIN_SRC_DIR}app/core/auth/account.service.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/core/util/event-manager.service.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/core/util/data-util.service.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/core/util/parse-links.service.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/core/util/alert.service.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/home/home.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/login/login.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/layouts/main/main.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/layouts/navbar/navbar.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/shared/item-count.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/shared/alert/alert.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/shared/alert/alert-error.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/shared/date/format-medium-date.pipe.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/shared/date/format-medium-datetime.pipe.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/shared/sort/sort.directive.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/shared/sort/sort-by.directive.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/shared/language/translate.directive.spec.ts`, 'tsconfig.app.json', 'tsconfig.spec.json', 'tsconfig.json', @@ -574,13 +574,13 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics.module.ts`, `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics.model.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/admin/configuration/configuration.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/admin/configuration/configuration.service.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/admin/health/health.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/admin/logs/logs.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/admin/logs/logs.service.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/admin/metrics/metrics.component.spec.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/admin/metrics/metrics.service.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/configuration/configuration.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/configuration/configuration.service.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/health/health.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/logs/logs.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/logs/logs.service.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/admin/metrics/metrics.service.spec.ts`, ], clientAdminReact: [ @@ -621,7 +621,7 @@ const expectedFiles = { `${CLIENT_MAIN_SRC_DIR}app/account/sessions/sessions.route.ts`, `${CLIENT_MAIN_SRC_DIR}app/account/sessions/sessions.service.ts`, `${CLIENT_MAIN_SRC_DIR}app/core/auth/auth-session.service.ts`, - `${CLIENT_TEST_SRC_DIR}spec/app/account/sessions/sessions.component.spec.ts`, + `${CLIENT_MAIN_SRC_DIR}app/account/sessions/sessions.component.spec.ts`, ], jwtServer: [ From 29c6854eec6e0ecaf2b8429b93ecc1cc266d8b3a Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Tue, 1 Dec 2020 13:17:33 +0200 Subject: [PATCH 0067/1179] Polish imports --- .../app/account/activate/activate.component.spec.ts.ejs | 4 ++-- .../finish/password-reset-finish.component.spec.ts.ejs | 4 ++-- .../init/password-reset-init.component.spec.ts.ejs | 4 ++-- .../password-strength-bar.component.spec.ts.ejs | 2 +- .../app/account/password/password.component.spec.ts.ejs | 5 +++-- .../app/account/register/register.component.spec.ts.ejs | 5 +++-- .../app/account/sessions/sessions.component.spec.ts.ejs | 7 ++++--- .../app/account/settings/settings.component.spec.ts.ejs | 3 ++- .../configuration/configuration.component.spec.ts.ejs | 6 +++--- .../admin/configuration/configuration.service.spec.ts.ejs | 5 +++-- .../webapp/app/admin/health/health.component.spec.ts.ejs | 6 +++--- .../main/webapp/app/admin/logs/logs.component.spec.ts.ejs | 6 +++--- .../main/webapp/app/admin/logs/logs.service.spec.ts.ejs | 3 ++- .../webapp/app/admin/metrics/metrics.component.spec.ts.ejs | 4 ++-- .../webapp/app/admin/metrics/metrics.service.spec.ts.ejs | 5 +++-- .../user-management-delete-dialog.component.spec.ts.ejs | 3 ++- .../detail/user-management-detail.component.spec.ts.ejs | 3 ++- .../list/user-management.component.spec.ts.ejs | 3 ++- .../update/user-management-update.component.spec.ts.ejs | 3 ++- .../main/webapp/app/core/auth/account.service.spec.ts.ejs | 3 ++- .../main/webapp/app/core/util/alert.service.spec.ts.ejs | 2 +- .../webapp/app/core/util/data-util.service.spec.ts.ejs | 2 +- .../webapp/app/core/util/event-manager.service.spec.ts.ejs | 2 +- .../webapp/app/core/util/parse-links.service.spec.ts.ejs | 2 +- .../src/main/webapp/app/home/home.component.spec.ts.ejs | 3 ++- .../webapp/app/layouts/main/main.component.spec.ts.ejs | 3 ++- .../webapp/app/layouts/navbar/navbar.component.spec.ts.ejs | 3 ++- .../src/main/webapp/app/login/login.component.spec.ts.ejs | 5 +++-- .../app/shared/alert/alert-error.component.spec.ts.ejs | 3 ++- .../webapp/app/shared/alert/alert.component.spec.ts.ejs | 3 ++- .../app/shared/date/format-medium-date.pipe.spec.ts.ejs | 2 +- .../shared/date/format-medium-datetime.pipe.spec.ts.ejs | 2 +- .../webapp/app/shared/item-count.component.spec.ts.ejs | 3 ++- .../app/shared/language/translate.directive.spec.ts.ejs | 2 +- .../webapp/app/shared/sort/sort-by.directive.spec.ts.ejs | 4 ++-- .../main/webapp/app/shared/sort/sort.directive.spec.ts.ejs | 2 +- .../entity-management-delete-dialog.component.spec.ts.ejs | 3 ++- .../detail/entity-management-detail.component.spec.ts.ejs | 3 ++- .../app/entities/entity-management.service.spec.ts.ejs | 3 ++- .../entities/list/entity-management.component.spec.ts.ejs | 3 ++- .../update/entity-management-update.component.spec.ts.ejs | 3 ++- 41 files changed, 83 insertions(+), 59 deletions(-) diff --git a/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs index 92d0c97b1ea5..2fea51316aec 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs @@ -21,8 +21,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ActivatedRoute } from '@angular/router'; import { of, throwError } from 'rxjs'; -import { ActivateService } from 'app/account/activate/activate.service'; -import { ActivateComponent } from 'app/account/activate/activate.component'; +import { ActivateService } from './activate.service'; +import { ActivateComponent } from './activate.component'; describe('Component Tests', () => { describe('ActivateComponent', () => { diff --git a/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs index 89d3eb87e8cb..22e1917ae39b 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs @@ -23,8 +23,8 @@ import { FormBuilder } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; import { of, throwError } from 'rxjs'; -import { PasswordResetFinishComponent } from 'app/account/password-reset/finish/password-reset-finish.component'; -import { PasswordResetFinishService } from 'app/account/password-reset/finish/password-reset-finish.service'; +import { PasswordResetFinishComponent } from './password-reset-finish.component'; +import { PasswordResetFinishService } from './password-reset-finish.service'; describe('Component Tests', () => { describe('PasswordResetFinishComponent', () => { diff --git a/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs index 2786676454c1..7d656cd2fabf 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs @@ -22,8 +22,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { FormBuilder } from '@angular/forms'; import { of, throwError } from 'rxjs'; -import { PasswordResetInitComponent } from 'app/account/password-reset/init/password-reset-init.component'; -import { PasswordResetInitService } from 'app/account/password-reset/init/password-reset-init.service'; +import { PasswordResetInitComponent } from './password-reset-init.component'; +import { PasswordResetInitService } from './password-reset-init.service'; describe('Component Tests', () => { describe('PasswordResetInitComponent', () => { diff --git a/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs index be05aeffb924..c21e8ae0f11a 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs @@ -18,7 +18,7 @@ -%> import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { PasswordStrengthBarComponent } from 'app/account/password/password-strength-bar/password-strength-bar.component'; +import { PasswordStrengthBarComponent } from './password-strength-bar.component'; describe('Component Tests', () => { describe('PasswordStrengthBarComponent', () => { diff --git a/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.spec.ts.ejs index 1bcf831e7d6d..672073bb2a77 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.spec.ts.ejs @@ -24,10 +24,11 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { FormBuilder } from '@angular/forms'; import { of, throwError } from 'rxjs'; -import { PasswordComponent } from 'app/account/password/password.component'; -import { PasswordService } from 'app/account/password/password.service'; import { AccountService } from 'app/core/auth/account.service'; +import { PasswordComponent } from './password.component'; +import { PasswordService } from './password.service'; + describe('Component Tests', () => { describe('PasswordComponent', () => { let comp: PasswordComponent; diff --git a/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.spec.ts.ejs index 34d3e260bdd1..3b8944907969 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.spec.ts.ejs @@ -29,8 +29,9 @@ import { TranslateService } from '@ngx-translate/core'; <%_ } _%> import { EMAIL_ALREADY_USED_TYPE, LOGIN_ALREADY_USED_TYPE } from 'app/config/error.constants'; -import { RegisterService } from 'app/account/register/register.service'; -import { RegisterComponent } from 'app/account/register/register.component'; + +import { RegisterService } from './register.service'; +import { RegisterComponent } from './register.component'; describe('Component Tests', () => { describe('RegisterComponent', () => { diff --git a/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs index 8f871faba96b..58cedd32d613 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs @@ -22,12 +22,13 @@ import { ComponentFixture, TestBed, inject, tick, fakeAsync } from '@angular/cor import { HttpClientTestingModule } from '@angular/common/http/testing'; import { of, throwError } from 'rxjs'; -import { Session } from 'app/account/sessions/session.model'; -import { SessionsComponent } from 'app/account/sessions/sessions.component'; -import { SessionsService } from 'app/account/sessions/sessions.service'; import { AccountService } from 'app/core/auth/account.service'; import { Account } from 'app/core/user/account.model'; +import { Session } from './session.model'; +import { SessionsComponent } from './sessions.component'; +import { SessionsService } from './sessions.service'; + describe('Component Tests', () => { let fixture: ComponentFixture; let comp: SessionsComponent; diff --git a/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs index f79522813ee0..32a3d7c1605f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs @@ -31,7 +31,8 @@ import { TranslateService } from '@ngx-translate/core'; import { AccountService } from 'app/core/auth/account.service'; import { Account } from 'app/core/user/account.model'; -import { SettingsComponent } from 'app/account/settings/settings.component'; + +import { SettingsComponent } from './settings.component'; describe('Component Tests', () => { describe('SettingsComponent', () => { diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs index 3bbc4d4d3d28..8d6ed314def4 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs @@ -20,9 +20,9 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { of } from 'rxjs'; -import { ConfigurationComponent } from 'app/admin/configuration/configuration.component'; -import { ConfigurationService } from 'app/admin/configuration/configuration.service'; -import { Bean, PropertySource } from 'app/admin/configuration/configuration.model'; +import { ConfigurationComponent } from './configuration.component'; +import { ConfigurationService } from './configuration.service'; +import { Bean, PropertySource } from './configuration.model'; describe('Component Tests', () => { describe('ConfigurationComponent', () => { diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs index ad88e67362f6..bcf46b27832b 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs @@ -19,10 +19,11 @@ import { TestBed } from '@angular/core/testing'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; -import { ConfigurationService } from 'app/admin/configuration/configuration.service'; -import { Bean, ConfigProps, Env, PropertySource } from 'app/admin/configuration/configuration.model'; import { SERVER_API_URL } from 'app/app.constants'; +import { ConfigurationService } from './configuration.service'; +import { Bean, ConfigProps, Env, PropertySource } from './configuration.model'; + describe('Service Tests', () => { describe('Logs Service', () => { let service: ConfigurationService; diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.ejs index 1453d59cc89b..82188a4e85a2 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.ejs @@ -21,9 +21,9 @@ import { HttpErrorResponse } from '@angular/common/http'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { of, throwError } from 'rxjs'; -import { HealthComponent } from 'app/admin/health/health.component'; -import { HealthService } from 'app/admin/health/health.service'; -import { Health } from 'app/admin/health/health.model'; +import { HealthComponent } from './health.component'; +import { HealthService } from './health.service'; +import { Health } from './health.model'; describe('Component Tests', () => { describe('HealthComponent', () => { diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs index 5231c130a919..819ced28aea6 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs @@ -20,9 +20,9 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { of } from 'rxjs'; -import { LogsComponent } from 'app/admin/logs/logs.component'; -import { LogsService } from 'app/admin/logs/logs.service'; -import { Log } from 'app/admin/logs/log.model'; +import { LogsComponent } from './logs.component'; +import { LogsService } from './logs.service'; +import { Log } from './log.model'; describe('Component Tests', () => { describe('LogsComponent', () => { diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.spec.ts.ejs index 04a74b02c46d..15d7f521511b 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.spec.ts.ejs @@ -19,9 +19,10 @@ import { TestBed } from '@angular/core/testing'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; -import { LogsService } from 'app/admin/logs/logs.service'; import { SERVER_API_URL } from 'app/app.constants'; +import { LogsService } from './logs.service'; + describe('Service Tests', () => { describe('Logs Service', () => { let service: LogsService; diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs index ac9813f2043f..4efac27686fd 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs @@ -20,8 +20,8 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { of } from 'rxjs'; -import { MetricsComponent } from 'app/admin/metrics/metrics.component'; -import { MetricsService } from 'app/admin/metrics/metrics.service'; +import { MetricsComponent } from './metrics.component'; +import { MetricsService } from './metrics.service'; describe('Component Tests', () => { describe('MetricsComponent', () => { diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.spec.ts.ejs index eff676e285a5..b7a57c39d663 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.spec.ts.ejs @@ -19,10 +19,11 @@ import { TestBed } from '@angular/core/testing'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; -import { MetricsService } from 'app/admin/metrics/metrics.service'; -import { ThreadDump, ThreadState } from 'app/admin/metrics/metrics.model'; import { SERVER_API_URL } from 'app/app.constants'; +import { MetricsService } from './metrics.service'; +import { ThreadDump, ThreadState } from './metrics.model'; + describe('Service Tests', () => { describe('Logs Service', () => { let service: MetricsService; diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs index de4dd987f28a..6da6d4d77cbe 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs @@ -23,9 +23,10 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { of } from 'rxjs'; -import { UserManagementDeleteDialogComponent } from 'app/admin/user-management/delete/user-management-delete-dialog.component'; import { UserService } from 'app/core/user/user.service'; +import { UserManagementDeleteDialogComponent } from './user-management-delete-dialog.component'; + describe('Component Tests', () => { describe('User Management Delete Component', () => { let comp: UserManagementDeleteDialogComponent; diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs index fcf50c639d89..3ae83f6ee097 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs @@ -24,9 +24,10 @@ import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; import { Authority } from 'app/config/authority.constants'; -import { UserManagementDetailComponent } from 'app/admin/user-management/detail/user-management-detail.component'; import { User } from 'app/core/user/user.model'; +import { UserManagementDetailComponent } from './user-management-detail.component'; + describe('Component Tests', () => { describe('User Management Detail Component', () => { let comp: UserManagementDetailComponent; diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs index 86b2c0acf95d..b45785927078 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs @@ -28,11 +28,12 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ActivatedRoute, Router } from '@angular/router'; import { of } from 'rxjs'; -import { UserManagementComponent } from 'app/admin/user-management/list/user-management.component'; import { UserService } from 'app/core/user/user.service'; import { User } from 'app/core/user/user.model'; import { AccountService } from 'app/core/auth/account.service'; +import { UserManagementComponent } from './user-management.component'; + describe('Component Tests', () => { describe('User Management Component', () => { let comp: UserManagementComponent; diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs index c153af0fca3d..8d869190ecee 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs @@ -27,10 +27,11 @@ import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; import { Authority } from 'app/config/authority.constants'; -import { UserManagementUpdateComponent } from 'app/admin/user-management/update/user-management-update.component'; import { UserService } from 'app/core/user/user.service'; import { User } from 'app/core/user/user.model'; +import { UserManagementUpdateComponent } from './user-management-update.component'; + describe('Component Tests', () => { describe('User Management Update Component', () => { let comp: UserManagementUpdateComponent; diff --git a/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.spec.ts.ejs index 54f4ec81c6f1..63bb8b3cfd91 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.spec.ts.ejs @@ -34,7 +34,6 @@ import { TranslateService } from '@ngx-translate/core'; import { NgxWebstorageModule } from 'ngx-webstorage'; import { SERVER_API_URL } from 'app/app.constants'; -import { AccountService } from 'app/core/auth/account.service'; import { Account } from 'app/core/user/account.model'; import { Authority } from 'app/config/authority.constants'; import { StateStorageService } from 'app/core/auth/state-storage.service'; @@ -42,6 +41,8 @@ import { StateStorageService } from 'app/core/auth/state-storage.service'; import { TrackerService } from 'app/core/tracker/tracker.service'; <%_ } _%> +import { AccountService } from './account.service'; + function accountWithAuthorities(authorities: string[]): Account { return { activated: true, diff --git a/generators/client/templates/angular/src/main/webapp/app/core/util/alert.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/util/alert.service.spec.ts.ejs index 40268ddbf99d..63c422eb19bf 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/util/alert.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/util/alert.service.spec.ts.ejs @@ -21,7 +21,7 @@ import { inject, TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; <%_ } _%> -import { Alert, AlertService } from 'app/core/util/alert.service'; +import { Alert, AlertService } from './alert.service'; describe('Alert service test', () => { describe('Alert Service Test', () => { diff --git a/generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.spec.ts.ejs index 79e47eda5c5d..7194aad14e9b 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.spec.ts.ejs @@ -18,7 +18,7 @@ -%> import { inject, TestBed } from '@angular/core/testing'; -import { DataUtils } from 'app/core/util/data-util.service'; +import { DataUtils } from './data-util.service'; describe('Data Utils Service Test', () => { beforeEach(() => { diff --git a/generators/client/templates/angular/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs index a93e04e3ea7c..2069035303ad 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs @@ -18,7 +18,7 @@ -%> import { inject, TestBed } from '@angular/core/testing'; -import { EventManager, EventWithContent } from 'app/core/util/event-manager.service'; +import { EventManager, EventWithContent } from './event-manager.service'; describe('Event Manager test', () => { describe('Event Manager Test', () => { diff --git a/generators/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.spec.ts.ejs index c6b2964f912d..765d6f8cf3ab 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.spec.ts.ejs @@ -18,7 +18,7 @@ -%> import { inject, TestBed } from '@angular/core/testing'; -import { ParseLinks } from 'app/core/util/parse-links.service'; +import { ParseLinks } from './parse-links.service'; describe('Parse links service test', () => { describe('Parse Links Service Test', () => { diff --git a/generators/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.ejs index 467f4ea0abec..b8129684af87 100644 --- a/generators/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.ejs @@ -29,12 +29,13 @@ import { Router } from '@angular/router'; <%_ } _%> import { of } from 'rxjs'; -import { HomeComponent } from 'app/home/home.component'; import { AccountService } from 'app/core/auth/account.service'; <%_ if (authenticationType === 'oauth2') { _%> import { LoginService } from 'app/login/login.service'; <%_ } _%> +import { HomeComponent } from './home.component'; + describe('Component Tests', () => { describe('Home Component', () => { let comp: HomeComponent; diff --git a/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs index dacf6d41aa48..1a82cd2c3a85 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs @@ -26,12 +26,13 @@ import { Subject, of } from 'rxjs'; import { TranslateModule, TranslateService, LangChangeEvent } from '@ngx-translate/core'; <%_ } _%> -import { MainComponent } from 'app/layouts/main/main.component'; import { AccountService } from 'app/core/auth/account.service'; <%_ if (enableI18nRTL) { _%> import { FindLanguageFromKeyPipe } from 'app/shared/language/find-language-from-key.pipe'; <%_ } _%> +import { MainComponent } from './main.component'; + describe('Component Tests', () => { describe('MainComponent', () => { let comp: MainComponent; diff --git a/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs index 984cddc19d99..c76edf691fbd 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs @@ -34,11 +34,12 @@ import { TranslateService } from '@ngx-translate/core'; <%_ } _%> import { ProfileInfo } from 'app/layouts/profiles/profile-info.model'; -import { NavbarComponent } from 'app/layouts/navbar/navbar.component'; import { AccountService } from 'app/core/auth/account.service'; import { ProfileService } from 'app/layouts/profiles/profile.service'; import { LoginService } from 'app/login/login.service'; +import { NavbarComponent } from './navbar.component'; + describe('Component Tests', () => { describe('Navbar Component', () => { let comp: NavbarComponent; diff --git a/generators/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.ejs index d066b8c218ea..7526e660763e 100644 --- a/generators/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.ejs @@ -25,10 +25,11 @@ import { FormBuilder } from '@angular/forms'; import { Router } from '@angular/router'; import { of } from 'rxjs'; -import { LoginService } from 'app/login/login.service'; -import { LoginComponent } from 'app/login/login.component'; import { AccountService } from 'app/core/auth/account.service'; +import { LoginService } from './login.service'; +import { LoginComponent } from './login.component'; + describe('Component Tests', () => { describe('LoginComponent', () => { let comp: LoginComponent; diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.spec.ts.ejs index 44b4d6ffcd81..d451b40912ea 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.spec.ts.ejs @@ -25,10 +25,11 @@ import { HttpErrorResponse, HttpHeaders } from '@angular/common/http'; import { TranslateModule } from '@ngx-translate/core'; <%_ } _%> -import { AlertErrorComponent } from 'app/shared/alert/alert-error.component'; import { EventManager } from 'app/core/util/event-manager.service'; import { Alert, AlertService } from 'app/core/util/alert.service'; +import { AlertErrorComponent } from './alert-error.component'; + describe('Component Tests', () => { describe('Alert Error Component', () => { let comp: AlertErrorComponent; diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs index c69ee900af8b..922746df7fbd 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs @@ -21,7 +21,8 @@ jest.mock('app/core/util/alert.service'); import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { AlertService } from 'app/core/util/alert.service'; -import { AlertComponent } from 'app/shared/alert/alert.component'; + +import { AlertComponent } from './alert.component'; describe('Component Tests', () => { describe('Alert Component', () => { diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.spec.ts.ejs index 34b05ff917fc..5b4eaecb9044 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.spec.ts.ejs @@ -18,7 +18,7 @@ -%> import * as dayjs from 'dayjs'; -import { FormatMediumDatePipe } from 'app/shared/date/format-medium-date.pipe'; +import { FormatMediumDatePipe } from './format-medium-date.pipe'; describe('FormatMediumDatePipe', () => { const formatMediumDatePipe = new FormatMediumDatePipe(); diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.spec.ts.ejs index 8aa1663ee82a..fcee787dd298 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.spec.ts.ejs @@ -18,7 +18,7 @@ -%> import * as dayjs from 'dayjs'; -import { FormatMediumDatetimePipe } from 'app/shared/date/format-medium-datetime.pipe'; +import { FormatMediumDatetimePipe } from './format-medium-datetime.pipe'; describe('FormatMediumDatePipe', () => { const formatMediumDatetimePipe = new FormatMediumDatetimePipe(); diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/item-count.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/item-count.component.spec.ts.ejs index d9d33f2ec4c3..1404dd94fcc8 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/item-count.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/item-count.component.spec.ts.ejs @@ -21,11 +21,12 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; <%_ } _%> -import { ItemCountComponent } from 'app/shared/item-count.component'; <%_ if (enableTranslation) { _%> import { TranslateDirective } from 'app/shared/language/translate.directive'; <%_ } _%> +import { ItemCountComponent } from './item-count.component'; + describe('ItemCountComponent test', () => { let comp: ItemCountComponent; let fixture: ComponentFixture; diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.spec.ts.ejs index ed92bc526df3..3495d2adb7a7 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.spec.ts.ejs @@ -20,7 +20,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { TranslateDirective } from './translate.directive'; @Component({ template: `
Translate="test">
`, diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.ejs index 2c3e6685ee5a..a6cbe8470190 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.ejs @@ -22,8 +22,8 @@ import { By } from '@angular/platform-browser'; import { FaIconComponent, FaIconLibrary } from '@fortawesome/angular-fontawesome'; import { fas, faSort, faSortDown, faSortUp } from '@fortawesome/free-solid-svg-icons'; -import { SortByDirective } from 'app/shared/sort/sort-by.directive'; -import { SortDirective } from 'app/shared/sort/sort.directive'; +import { SortByDirective } from './sort-by.directive'; +import { SortDirective } from './sort.directive'; @Component({ template: ` diff --git a/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort.directive.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort.directive.spec.ts.ejs index 452c8669953c..f0c7a8dc6060 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort.directive.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort.directive.spec.ts.ejs @@ -20,7 +20,7 @@ import { Component, DebugElement } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { SortDirective } from 'app/shared/sort/sort.directive'; +import { SortDirective } from './sort.directive'; @Component({ template: ` diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs index 06033accd693..4e60c8896f47 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs @@ -26,9 +26,10 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { of } from 'rxjs'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { <%= entityAngularName %>DeleteDialogComponent } from 'app/entities/<%= entityFolderName %>/delete/<%= entityFileName %>-delete-dialog.component'; import { <%= entityAngularName %>Service } from 'app/entities/<%= entityFolderName %>/<%= entityFileName %>.service'; +import { <%= entityAngularName %>DeleteDialogComponent } from './<%= entityFileName %>-delete-dialog.component'; + describe('Component Tests', () => { describe('<%= entityAngularName %> Management Delete Component', () => { let comp: <%= entityAngularName %>DeleteDialogComponent; diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.spec.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.spec.ts.ejs index 993c4f9b0806..dca99564eb74 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.spec.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.spec.ts.ejs @@ -23,12 +23,13 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; -import { <%= entityAngularName %>DetailComponent } from 'app/entities/<%= entityFolderName %>/detail/<%= entityFileName %>-detail.component'; import { <%= entityAngularName %> } from 'app/shared/model/<%= entityModelFileName %>.model'; <%_ if (fieldsContainBlob) { _%> import { DataUtils } from 'app/core/util/data-util.service'; <%_ } _%> +import { <%= entityAngularName %>DetailComponent } from './<%= entityFileName %>-detail.component'; + describe('Component Tests', () => { describe('<%= entityAngularName %> Management Detail Component', () => { let comp: <%= entityAngularName %>DetailComponent; diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.service.spec.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.service.spec.ts.ejs index ce390b768851..0d427dad0aa3 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.service.spec.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.service.spec.ts.ejs @@ -27,12 +27,13 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/ import * as dayjs from 'dayjs'; import { <% if (fieldsContainLocalDate) { %>DATE_FORMAT,<% } if (fieldsContainInstant || fieldsContainZonedDateTime) { %> DATE_TIME_FORMAT<% } %> } from 'app/config/input.constants'; <%_ } _%> -import { <%= entityAngularName %>Service } from 'app/entities/<%= entityFolderName %>/<%= entityFileName %>.service'; import { I<%= entityAngularName %>, <%= entityAngularName %> } from 'app/shared/model/<%= entityModelFileName %>.model'; <%_ enumImports.forEach( (importedPath, importedType) => { _%> import { <%- importedType %> } from '<%- importedPath %>'; <%_ }); _%> +import { <%= entityAngularName %>Service } from './<%= entityFileName %>.service'; + describe('Service Tests', () => { describe('<%= entityAngularName %> Service', () => { let service: <%= entityAngularName %>Service; diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.spec.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.spec.ts.ejs index 4414e113c5c2..ddd6c8033788 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.spec.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.spec.ts.ejs @@ -34,10 +34,11 @@ import { ActivatedRoute } from '@angular/router'; <%_ } _%> import { of } from 'rxjs'; -import { <%= entityAngularName %>Component } from 'app/entities/<%= entityFolderName %>/list/<%= entityFileName %>.component'; import { <%= entityAngularName %>Service } from 'app/entities/<%= entityFolderName %>/<%= entityFileName %>.service'; import { <%= entityAngularName %> } from 'app/shared/model/<%= entityModelFileName %>.model'; +import { <%= entityAngularName %>Component } from './<%= entityFileName %>.component'; + describe('Component Tests', () => { describe('<%= entityAngularName %> Management Component', () => { let comp: <%= entityAngularName %>Component; diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.spec.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.spec.ts.ejs index f1d9e4f66ecb..3ce7c93b43d0 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.spec.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.spec.ts.ejs @@ -28,10 +28,11 @@ import { FormBuilder } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; import { of } from 'rxjs'; -import { <%= entityAngularName %>UpdateComponent } from 'app/entities/<%= entityFolderName %>/update/<%= entityFileName %>-update.component'; import { <%= entityAngularName %>Service } from 'app/entities/<%= entityFolderName %>/<%= entityFileName %>.service'; import { <%= entityAngularName %> } from 'app/shared/model/<%= entityModelFileName %>.model'; +import { <%= entityAngularName %>UpdateComponent } from './<%= entityFileName %>-update.component'; + describe('Component Tests', () => { describe('<%= entityAngularName %> Management Update Component', () => { let comp: <%= entityAngularName %>UpdateComponent; From 56a0e376f1a307f49dd5961f04cedfc378d31cf2 Mon Sep 17 00:00:00 2001 From: evertude Date: Tue, 1 Dec 2020 12:37:43 +0100 Subject: [PATCH 0068/1179] empty user role causes authentication to crash (for all) --- .../src/main/java/package/security/jwt/TokenProvider.java.ejs | 1 + 1 file changed, 1 insertion(+) diff --git a/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs b/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs index 1c71a2c4adf9..beadb13547a4 100644 --- a/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs +++ b/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs @@ -105,6 +105,7 @@ public class TokenProvider { Collection authorities = Arrays.stream(claims.get(AUTHORITIES_KEY).toString().split(",")) + .filter(auth -> !auth.isBlank()) .map(SimpleGrantedAuthority::new) .collect(Collectors.toList()); From 918caecc2b851cde89bd5360e8f3ca2ca3aa5e83 Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Tue, 1 Dec 2020 15:58:02 +0200 Subject: [PATCH 0069/1179] Delete old test files file by file --- generators/cleanup.js | 65 ++++++++++++++++++++++++++++++- generators/entity-client/index.js | 15 +++++++ 2 files changed, 78 insertions(+), 2 deletions(-) diff --git a/generators/cleanup.js b/generators/cleanup.js index 9a7155be8e9f..a22ff7c86c23 100644 --- a/generators/cleanup.js +++ b/generators/cleanup.js @@ -156,8 +156,6 @@ function cleanupOldFiles(generator) { generator.removeFile('tsconfig.base.json'); generator.removeFile('postcss.config.js'); generator.removeFile('proxy.conf.json'); - generator.removeFolder(`${CLIENT_TEST_SRC_DIR}spec`); - generator.removeFile(`${CLIENT_TEST_SRC_DIR}jest.conf.js`); generator.removeFile('tslint.json'); // unreleased files and folders cleanup for v7 developers @@ -176,6 +174,69 @@ function cleanupOldFiles(generator) { generator.removeFolder(`${ANGULAR_DIR}admin/metrics/metrics-modal-threads`); generator.removeFolder(`${ANGULAR_DIR}admin/metrics/metrics-request`); generator.removeFolder(`${ANGULAR_DIR}admin/metrics/metrics-system`); + + // test files removal from old location + // a) deleted before moving tests next to files they are testing + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/account/password/password-strength-bar.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/user-management-delete-dialog.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/user-management-detail.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/user-management.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/user-management-update.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/core/login/login-modal.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/core/login/login-modal.service.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/core/user/account.service.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/audits/audits.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/audits/audits.service.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/shared/login/login.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/test.module.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}jest.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}jest-global-mocks.ts`); + generator.removeFolder(`${CLIENT_TEST_SRC_DIR}spec/helpers`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/shared/translate.directive.spec.ts`); + generator.removeFolder(`${CLIENT_TEST_SRC_DIR}spec/app/core/event-manager`); + // b) deleted while moving tests next to files they are testing + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/account/activate/activate.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/account/password-reset/finish/password-reset-finish.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/account/password-reset/init/password-reset-init.component.spec.ts`); + generator.removeFile( + `${CLIENT_TEST_SRC_DIR}spec/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts` + ); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/account/password/password.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/account/register/register.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/account/sessions/sessions.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/account/settings/settings.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/configuration/configuration.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/configuration/configuration.service.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/health/health.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/logs/logs.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/logs/logs.service.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/metrics/metrics.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/metrics/metrics.service.spec.ts`); + generator.removeFile( + `${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts` + ); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/detail/user-management-detail.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/list/user-management.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/admin/user-management/update/user-management-update.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/core/auth/account.service.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/core/user/user.service.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/core/util/alert.service.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/core/util/data-util.service.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/core/util/event-manager.service.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/core/util/parse-links.service.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/home/home.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/layouts/main/main.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/layouts/navbar/navbar.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/login/login.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/shared/alert/alert-error.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/shared/alert/alert.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/shared/date/format-medium-date.pipe.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/shared/date/format-medium-datetime.pipe.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/shared/item-count.component.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/shared/language/translate.directive.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/shared/sort/sort-by.directive.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/shared/sort/sort.directive.spec.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}jest.conf.js`); } else if (generator.jhipsterConfig.clientFramework === REACT) { generator.removeFile(`${REACT_DIR}modules/administration/audits/audits.tsx`); generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/enzyme-setup.ts`); diff --git a/generators/entity-client/index.js b/generators/entity-client/index.js index 1a5274885181..87a4e7311595 100644 --- a/generators/entity-client/index.js +++ b/generators/entity-client/index.js @@ -96,6 +96,21 @@ module.exports = class extends BaseBlueprintGenerator { this.removeFile( `${this.CLIENT_MAIN_SRC_DIR}/app/entities/${this.entityFolderName}/${this.entityFileName}-update.component.html` ); + this.removeFile( + `${this.CLIENT_TEST_SRC_DIR}/spec/app/entities/${this.entityFolderName}/${this.entityFileName}.component.spec.ts` + ); + this.removeFile( + `${this.CLIENT_TEST_SRC_DIR}/spec/app/entities/${this.entityFolderName}/${this.entityFileName}-detail.component.spec.ts` + ); + this.removeFile( + `${this.CLIENT_TEST_SRC_DIR}/spec/app/entities/${this.entityFolderName}/${this.entityFileName}-delete-dialog.component.spec.ts` + ); + this.removeFile( + `${this.CLIENT_TEST_SRC_DIR}/spec/app/entities/${this.entityFolderName}/${this.entityFileName}-update.component.spec.ts` + ); + this.removeFile( + `${this.CLIENT_TEST_SRC_DIR}/spec/app/entities/${this.entityFolderName}/${this.entityFileName}.service.spec.ts` + ); } }, ...writeFiles(), From 2500ed97424430a5e456f732ba9ebe0ff07a86da Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Tue, 1 Dec 2020 16:06:40 +0200 Subject: [PATCH 0070/1179] [angular] Clean up helpers file by file instead of removing whole folder --- generators/cleanup.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/generators/cleanup.js b/generators/cleanup.js index a22ff7c86c23..1615a3dbfe7b 100644 --- a/generators/cleanup.js +++ b/generators/cleanup.js @@ -191,7 +191,17 @@ function cleanupOldFiles(generator) { generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/test.module.ts`); generator.removeFile(`${CLIENT_TEST_SRC_DIR}jest.ts`); generator.removeFile(`${CLIENT_TEST_SRC_DIR}jest-global-mocks.ts`); - generator.removeFolder(`${CLIENT_TEST_SRC_DIR}spec/helpers`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/helpers/mock-account.service.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/helpers/mock-active-modal.service.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/helpers/mock-alert.service.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/helpers/mock-event-manager.service.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/helpers/mock-language.service.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/helpers/mock-login-modal.service.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/helpers/mock-login.service.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/helpers/mock-route.service.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/helpers/mock-state-storage.service.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/helpers/mock-tracker.service.ts`); + generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/helpers/spyobject.ts`); generator.removeFile(`${CLIENT_TEST_SRC_DIR}spec/app/shared/translate.directive.spec.ts`); generator.removeFolder(`${CLIENT_TEST_SRC_DIR}spec/app/core/event-manager`); // b) deleted while moving tests next to files they are testing From 99c3ba9266c68a8172633800c7c2225ecfcd2aa5 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 1 Dec 2020 13:11:21 -0300 Subject: [PATCH 0071/1179] Don't ignore id fields. --- .../parsed-jdl-to-jdl-object-converter.js | 5 ----- .../parsed-jdl-to-jdl-object-converter.spec.js | 6 +++++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js b/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js index f6ce6007e18d..9ac05ae64a8f 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js +++ b/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js @@ -23,7 +23,6 @@ const JDLBinaryOption = require('../../models/jdl-binary-option'); const ApplicationTypes = require('../../jhipster/application-types'); const BinaryOptions = require('../../jhipster/binary-options'); const DatabaseTypes = require('../../jhipster/database-types'); -const { lowerFirst } = require('../../utils/string-utils'); const { convertApplications } = require('./application-converter'); const { convertEntities } = require('./entity-converter'); @@ -122,10 +121,6 @@ function getJDLFieldsFromParsedEntity(entity) { const fields = []; for (let i = 0; i < entity.body.length; i++) { const field = entity.body[i]; - const fieldName = lowerFirst(field.name); - if (fieldName.toLowerCase() === 'id') { - continue; // eslint-disable-line no-continue - } const jdlField = convertField(field); jdlField.validations = getValidations(field); jdlField.options = convertAnnotationsToOptions(field.annotations); diff --git a/test/jdl/converters/parsedJDLToJDLObject/parsed-jdl-to-jdl-object-converter.spec.js b/test/jdl/converters/parsedJDLToJDLObject/parsed-jdl-to-jdl-object-converter.spec.js index 1185796fa594..4a98a72b78f9 100644 --- a/test/jdl/converters/parsedJDLToJDLObject/parsed-jdl-to-jdl-object-converter.spec.js +++ b/test/jdl/converters/parsedJDLToJDLObject/parsed-jdl-to-jdl-object-converter.spec.js @@ -230,13 +230,17 @@ describe('ParsedJDLToJDLObjectConverter', () => { }); }); - it('should not add it', () => { + it('should add it', () => { expect(jdlObject.entities.A).to.deep.eq( new JDLEntity({ name: 'A', tableName: 'A', fields: { email: new JDLField({ name: 'email', type: FieldTypes.STRING }), + id: new JDLField({ + name: 'id', + type: FieldTypes.LONG, + }), }, }) ); From 4394101b16fd3136bdfadc505221a2d66d9818ca Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 1 Dec 2020 13:17:41 -0300 Subject: [PATCH 0072/1179] Adopt field with 'id' name as `@Id` if no `@Id` was provided. --- test/utils-entity.spec.js | 72 +++++++++++++++++++++++++++++++++++++++ utils/entity.js | 19 +++++++---- 2 files changed, 84 insertions(+), 7 deletions(-) create mode 100644 test/utils-entity.spec.js diff --git a/test/utils-entity.spec.js b/test/utils-entity.spec.js new file mode 100644 index 000000000000..545e95e3a621 --- /dev/null +++ b/test/utils-entity.spec.js @@ -0,0 +1,72 @@ +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. + * + * 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"); + * 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 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +const { expect } = require('chai'); +const { prepareEntityForTemplates } = require('../utils/entity'); +const { formatDateForChangelog } = require('../utils/liquibase'); +const { defaultConfig, entityDefaultConfig } = require('../generators/generator-defaults'); +const BaseGenerator = require('../generators/generator-base'); + +describe('entity utilities', () => { + const defaultGenerator = { jhipsterConfig: defaultConfig }; + Object.setPrototypeOf(defaultGenerator, BaseGenerator.prototype); + + describe('prepareEntityForTemplates', () => { + describe('with field with id name', () => { + describe('without @Id', () => { + let entity = { + ...entityDefaultConfig, + name: 'Entity', + changelogDate: formatDateForChangelog(new Date()), + fields: [{ fieldName: 'id', fieldType: 'CustomType' }], + }; + beforeEach(() => { + entity = prepareEntityForTemplates(entity, defaultGenerator); + }); + it('should adopt id field as @Id', () => { + expect(entity.fields[0]).to.eql({ + fieldName: 'id', + fieldType: 'CustomType', + id: true, + }); + }); + }); + describe('with @Id', () => { + let entity = { + ...entityDefaultConfig, + name: 'Entity', + changelogDate: formatDateForChangelog(new Date()), + fields: [ + { fieldName: 'id', fieldType: 'CustomType' }, + { fieldName: 'uuid', fieldType: 'UUID', id: true }, + ], + }; + beforeEach(() => { + entity = prepareEntityForTemplates(entity, defaultGenerator); + }); + it('should not adopt id field as @Id', () => { + expect(entity.fields[0]).to.eql({ + fieldName: 'id', + fieldType: 'CustomType', + }); + }); + }); + }); + }); +}); diff --git a/utils/entity.js b/utils/entity.js index 9aac5c2ee97f..6b8abcbd7b0b 100644 --- a/utils/entity.js +++ b/utils/entity.js @@ -170,14 +170,19 @@ function prepareEntityForTemplates(entityWithConfig, generator) { let idCount = entityWithConfig.idFields.length + entityWithConfig.idRelationships.length; if (idCount === 0) { - const idField = { - fieldName: 'id', - id: true, - fieldNameHumanized: 'ID', - fieldTranslationKey: 'global.field.id', - }; + let idField = entityWithConfig.fields.find(field => field.fieldName === 'id'); + if (idField) { + idField.id = true; + } else { + idField = { + fieldName: 'id', + id: true, + fieldNameHumanized: 'ID', + fieldTranslationKey: 'global.field.id', + }; + entityWithConfig.fields.unshift(idField); + } entityWithConfig.idFields.push(idField); - entityWithConfig.fields.unshift(idField); idCount++; } if (idCount > 1) { From 2a8c8a1b388c20c5c54cab7cb1146371adb04be6 Mon Sep 17 00:00:00 2001 From: Marcelo Boveto Shima Date: Tue, 1 Dec 2020 13:02:03 -0300 Subject: [PATCH 0073/1179] Don't set otherEntityField as 'id' by default. --- .../jdl-to-json-relationship-converter.js | 13 ++++++--- ...jdl-to-json-relationship-converter.spec.js | 28 ------------------- ...ith-applications-to-json-converter.spec.js | 20 ------------- ...hout-application-to-json-converter.spec.js | 20 ------------- .../jhipster-entity-exporter.spec.js | 4 --- test/jdl/jdl-importer.spec.js | 15 ---------- .../jhipster_app/.jhipster/Country.json | 2 -- .../jhipster_app/.jhipster/Department.json | 2 -- .../jhipster_app/.jhipster/Employee.json | 3 +- .../jhipster_app/.jhipster/Job.json | 3 +- .../jhipster_app/.jhipster/JobHistory.json | 3 -- .../jhipster_app/.jhipster/Location.json | 1 - .../app_with_entities/.jhipster/Country.json | 1 - .../.jhipster/Department.json | 1 - .../app_with_entities/.jhipster/Employee.json | 6 ++-- .../app_with_entities/.jhipster/Job.json | 4 +-- .../.jhipster/JobHistory.json | 3 -- .../app_with_entities/.jhipster/Location.json | 1 - .../multi_apps/app2/.jhipster/Location.json | 1 - 19 files changed, 14 insertions(+), 117 deletions(-) diff --git a/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js b/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js index 30a894c15cdc..e7de37e916c0 100644 --- a/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js +++ b/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js @@ -91,7 +91,9 @@ function setRelationshipsFromEntity(relatedRelationships, entityName) { } const splitField = extractField(relationshipToConvert.injectedFieldInFrom); convertedRelationship.relationshipName = camelCase(splitField.relationshipName || relationshipToConvert.to); - convertedRelationship.otherEntityField = lowerFirst(splitField.otherEntityField); + if (splitField.otherEntityField) { + convertedRelationship.otherEntityField = lowerFirst(splitField.otherEntityField); + } if (relationshipToConvert.type === ONE_TO_ONE) { convertedRelationship.ownerSide = true; } else if (relationshipToConvert.type === MANY_TO_MANY) { @@ -104,10 +106,12 @@ function setRelationshipsFromEntity(relatedRelationships, entityName) { relationshipName: camelCase(relationshipToConvert.from), otherEntityName: camelCase(relationshipToConvert.from), relationshipType: _.kebabCase(MANY_TO_MANY), - otherEntityField: lowerFirst(otherSplitField.otherEntityField), otherEntityRelationshipName: lowerFirst(relationshipToConvert.to), ownerSide: false, }; + if (otherSplitField.otherEntityField) { + otherSideRelationship.otherEntityField = lowerFirst(otherSplitField.otherEntityField); + } convertedOtherEntityRelationships.push(otherSideRelationship); } } @@ -136,7 +140,9 @@ function setRelationshipsToEntity(relatedRelationships, entityName) { } const splitField = extractField(relationshipToConvert.injectedFieldInTo); convertedRelationship.relationshipName = camelCase(splitField.relationshipName || relationshipToConvert.from); - convertedRelationship.otherEntityField = lowerFirst(splitField.otherEntityField); + if (splitField.otherEntityField) { + convertedRelationship.otherEntityField = lowerFirst(splitField.otherEntityField); + } if (relationshipToConvert.type === ONE_TO_ONE || relationshipToConvert.type === MANY_TO_MANY) { convertedRelationship.ownerSide = false; } else if (relationshipToConvert.type === ONE_TO_MANY) { @@ -196,7 +202,6 @@ function setOptionsForRelationshipDestinationSide(relationshipToConvert, convert */ function extractField(field) { const splitField = { - otherEntityField: 'id', // id by default relationshipName: '', }; if (field) { diff --git a/test/jdl/converters/JDLToJSON/jdl-to-json-relationship-converter.spec.js b/test/jdl/converters/JDLToJSON/jdl-to-json-relationship-converter.spec.js index 1afad7b5984c..f05d942dc506 100644 --- a/test/jdl/converters/JDLToJSON/jdl-to-json-relationship-converter.spec.js +++ b/test/jdl/converters/JDLToJSON/jdl-to-json-relationship-converter.spec.js @@ -83,7 +83,6 @@ describe('JDLToJSONRelationshipConverter', () => { it('should convert them', () => { expect(relationshipsForA).to.deep.equal([ { - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -91,21 +90,18 @@ describe('JDLToJSONRelationshipConverter', () => { relationshipType: 'one-to-one', }, { - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', relationshipName: 'b', relationshipType: 'one-to-many', }, { - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', relationshipName: 'b', relationshipType: 'many-to-one', }, { - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -115,7 +111,6 @@ describe('JDLToJSONRelationshipConverter', () => { ]); expect(relationshipsForB).to.deep.equal([ { - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', ownerSide: false, @@ -123,21 +118,18 @@ describe('JDLToJSONRelationshipConverter', () => { relationshipType: 'one-to-one', }, { - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', relationshipName: 'a', relationshipType: 'many-to-one', }, { - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', relationshipName: 'a', relationshipType: 'one-to-many', }, { - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', ownerSide: false, @@ -173,7 +165,6 @@ describe('JDLToJSONRelationshipConverter', () => { options: { custom: 42, }, - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -204,7 +195,6 @@ describe('JDLToJSONRelationshipConverter', () => { it('should convert them', () => { expect(convertedRelationship).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -237,7 +227,6 @@ describe('JDLToJSONRelationshipConverter', () => { it('should convert them', () => { expect(relationshipsForA).to.deep.equal([ { - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -248,7 +237,6 @@ describe('JDLToJSONRelationshipConverter', () => { ]); expect(relationshipsForB).to.deep.equal([ { - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', ownerSide: false, @@ -282,7 +270,6 @@ describe('JDLToJSONRelationshipConverter', () => { expect(relationshipsForA).to.deep.equal([ { javadoc: 'A to B', - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -292,7 +279,6 @@ describe('JDLToJSONRelationshipConverter', () => { ]); expect(relationshipsForB).to.deep.equal([ { - otherEntityField: 'id', javadoc: 'A to B but in the destination', otherEntityName: 'a', otherEntityRelationshipName: 'b', @@ -322,7 +308,6 @@ describe('JDLToJSONRelationshipConverter', () => { it('should add the relationship for the source entity', () => { expect(relationshipFromSourceToDestination).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -352,7 +337,6 @@ describe('JDLToJSONRelationshipConverter', () => { it('should add the relationship for the source entity', () => { expect(relationshipFromSourceToDestination).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', relationshipName: 'b', @@ -361,7 +345,6 @@ describe('JDLToJSONRelationshipConverter', () => { }); it('should add the relationship for the destination entity', () => { expect(relationshipFromDestinationToSource).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', relationshipName: 'a', @@ -387,7 +370,6 @@ describe('JDLToJSONRelationshipConverter', () => { it('should add the relationship for the source entity', () => { expect(relationshipFromSourceToDestination).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', relationshipName: 'b', @@ -416,7 +398,6 @@ describe('JDLToJSONRelationshipConverter', () => { it('should add the relationship for the source entity', () => { expect(relationshipFromSourceToDestination).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -426,7 +407,6 @@ describe('JDLToJSONRelationshipConverter', () => { }); it('should add the relationship for the destination entity', () => { expect(relationshipFromDestinationToSource).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', ownerSide: false, @@ -455,7 +435,6 @@ describe('JDLToJSONRelationshipConverter', () => { it('should add the relationship for the source entity', () => { expect(relationshipFromSourceToDestination).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -465,7 +444,6 @@ describe('JDLToJSONRelationshipConverter', () => { }); it('should add the relationship for the destination entity', () => { expect(relationshipFromDestinationToSource).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', ownerSide: false, @@ -492,7 +470,6 @@ describe('JDLToJSONRelationshipConverter', () => { it('should add the relationship for the source entity', () => { expect(relationshipFromSourceToDestination).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', relationshipName: 'b', @@ -501,7 +478,6 @@ describe('JDLToJSONRelationshipConverter', () => { }); it('should add the relationship for the destination entity', () => { expect(relationshipFromDestinationToSource).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', relationshipName: 'a', @@ -527,7 +503,6 @@ describe('JDLToJSONRelationshipConverter', () => { it('should add the relationship for the source entity', () => { expect(relationshipFromSourceToDestination).to.deep.equal({ - otherEntityField: 'id', relationshipName: 'b', otherEntityName: 'b', otherEntityRelationshipName: 'a', @@ -536,7 +511,6 @@ describe('JDLToJSONRelationshipConverter', () => { }); it('should add the relationship for the destination entity', () => { expect(relationshipFromDestinationToSource).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', relationshipName: 'a', @@ -562,7 +536,6 @@ describe('JDLToJSONRelationshipConverter', () => { it('should add the relationship for the source entity', () => { expect(relationshipFromSourceToDestination).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -572,7 +545,6 @@ describe('JDLToJSONRelationshipConverter', () => { }); it('should add the relationship for the destination entity', () => { expect(relationshipFromDestinationToSource).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', ownerSide: false, diff --git a/test/jdl/converters/JDLToJSON/jdl-with-applications-to-json-converter.spec.js b/test/jdl/converters/JDLToJSON/jdl-with-applications-to-json-converter.spec.js index 3ee5938802e2..4c29ffd80a52 100644 --- a/test/jdl/converters/JDLToJSON/jdl-with-applications-to-json-converter.spec.js +++ b/test/jdl/converters/JDLToJSON/jdl-with-applications-to-json-converter.spec.js @@ -924,7 +924,6 @@ describe('JDLWithApplicationsToJSONConverter', () => { it('should convert them', () => { expect(relationshipsForA).to.deep.equal([ { - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -932,21 +931,18 @@ describe('JDLWithApplicationsToJSONConverter', () => { relationshipType: 'one-to-one', }, { - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', relationshipName: 'b', relationshipType: 'one-to-many', }, { - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', relationshipName: 'b', relationshipType: 'many-to-one', }, { - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -956,7 +952,6 @@ describe('JDLWithApplicationsToJSONConverter', () => { ]); expect(relationshipsForB).to.deep.equal([ { - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', ownerSide: false, @@ -964,21 +959,18 @@ describe('JDLWithApplicationsToJSONConverter', () => { relationshipType: 'one-to-one', }, { - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', relationshipName: 'a', relationshipType: 'many-to-one', }, { - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', relationshipName: 'a', relationshipType: 'one-to-many', }, { - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', ownerSide: false, @@ -1029,7 +1021,6 @@ describe('JDLWithApplicationsToJSONConverter', () => { options: { custom: 42, }, - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -1075,7 +1066,6 @@ describe('JDLWithApplicationsToJSONConverter', () => { it('should convert them', () => { expect(convertedRelationship).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -1123,7 +1113,6 @@ describe('JDLWithApplicationsToJSONConverter', () => { it('should convert them', () => { expect(relationshipsForA).to.deep.equal([ { - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -1134,7 +1123,6 @@ describe('JDLWithApplicationsToJSONConverter', () => { ]); expect(relationshipsForB).to.deep.equal([ { - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', ownerSide: false, @@ -1183,7 +1171,6 @@ describe('JDLWithApplicationsToJSONConverter', () => { expect(relationshipsForA).to.deep.equal([ { javadoc: 'A to B', - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -1193,7 +1180,6 @@ describe('JDLWithApplicationsToJSONConverter', () => { ]); expect(relationshipsForB).to.deep.equal([ { - otherEntityField: 'id', javadoc: 'A to B but in the destination', otherEntityName: 'a', otherEntityRelationshipName: 'b', @@ -1238,7 +1224,6 @@ describe('JDLWithApplicationsToJSONConverter', () => { it('should add the relationship for the source entity', () => { expect(relationshipFromSourceToDestination).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -1283,7 +1268,6 @@ describe('JDLWithApplicationsToJSONConverter', () => { it('should add the relationship for the source entity', () => { expect(relationshipFromSourceToDestination).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', relationshipName: 'b', @@ -1292,7 +1276,6 @@ describe('JDLWithApplicationsToJSONConverter', () => { }); it('should add the relationship for the destination entity', () => { expect(relationshipFromDestinationToSource).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', relationshipName: 'a', @@ -1333,7 +1316,6 @@ describe('JDLWithApplicationsToJSONConverter', () => { it('should add the relationship for the source entity', () => { expect(relationshipFromSourceToDestination).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', relationshipName: 'b', @@ -1377,7 +1359,6 @@ describe('JDLWithApplicationsToJSONConverter', () => { it('should add the relationship for the source entity', () => { expect(relationshipFromSourceToDestination).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -1387,7 +1368,6 @@ describe('JDLWithApplicationsToJSONConverter', () => { }); it('should add the relationship for the destination entity', () => { expect(relationshipFromDestinationToSource).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', ownerSide: false, diff --git a/test/jdl/converters/JDLToJSON/jdl-without-application-to-json-converter.spec.js b/test/jdl/converters/JDLToJSON/jdl-without-application-to-json-converter.spec.js index 545a4e01b378..20f83a52a415 100644 --- a/test/jdl/converters/JDLToJSON/jdl-without-application-to-json-converter.spec.js +++ b/test/jdl/converters/JDLToJSON/jdl-without-application-to-json-converter.spec.js @@ -903,7 +903,6 @@ describe('JDLWithoutApplicationToJSONConverter', () => { it('should convert them', () => { expect(relationshipsForA).to.deep.equal([ { - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -911,21 +910,18 @@ describe('JDLWithoutApplicationToJSONConverter', () => { relationshipType: 'one-to-one', }, { - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', relationshipName: 'b', relationshipType: 'one-to-many', }, { - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', relationshipName: 'b', relationshipType: 'many-to-one', }, { - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -935,7 +931,6 @@ describe('JDLWithoutApplicationToJSONConverter', () => { ]); expect(relationshipsForB).to.deep.equal([ { - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', ownerSide: false, @@ -943,21 +938,18 @@ describe('JDLWithoutApplicationToJSONConverter', () => { relationshipType: 'one-to-one', }, { - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', relationshipName: 'a', relationshipType: 'many-to-one', }, { - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', relationshipName: 'a', relationshipType: 'one-to-many', }, { - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', ownerSide: false, @@ -1004,7 +996,6 @@ describe('JDLWithoutApplicationToJSONConverter', () => { options: { custom: 42, }, - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -1046,7 +1037,6 @@ describe('JDLWithoutApplicationToJSONConverter', () => { it('should convert them', () => { expect(convertedRelationship).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -1090,7 +1080,6 @@ describe('JDLWithoutApplicationToJSONConverter', () => { it('should convert them', () => { expect(relationshipsForA).to.deep.equal([ { - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -1101,7 +1090,6 @@ describe('JDLWithoutApplicationToJSONConverter', () => { ]); expect(relationshipsForB).to.deep.equal([ { - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', ownerSide: false, @@ -1146,7 +1134,6 @@ describe('JDLWithoutApplicationToJSONConverter', () => { expect(relationshipsForA).to.deep.equal([ { javadoc: 'A to B', - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -1156,7 +1143,6 @@ describe('JDLWithoutApplicationToJSONConverter', () => { ]); expect(relationshipsForB).to.deep.equal([ { - otherEntityField: 'id', javadoc: 'A to B but in the destination', otherEntityName: 'a', otherEntityRelationshipName: 'b', @@ -1197,7 +1183,6 @@ describe('JDLWithoutApplicationToJSONConverter', () => { it('should add the relationship for the source entity', () => { expect(relationshipFromSourceToDestination).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -1238,7 +1223,6 @@ describe('JDLWithoutApplicationToJSONConverter', () => { it('should add the relationship for the source entity', () => { expect(relationshipFromSourceToDestination).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', relationshipName: 'b', @@ -1247,7 +1231,6 @@ describe('JDLWithoutApplicationToJSONConverter', () => { }); it('should add the relationship for the destination entity', () => { expect(relationshipFromDestinationToSource).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', relationshipName: 'a', @@ -1284,7 +1267,6 @@ describe('JDLWithoutApplicationToJSONConverter', () => { it('should add the relationship for the source entity', () => { expect(relationshipFromSourceToDestination).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', relationshipName: 'b', @@ -1324,7 +1306,6 @@ describe('JDLWithoutApplicationToJSONConverter', () => { it('should add the relationship for the source entity', () => { expect(relationshipFromSourceToDestination).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -1334,7 +1315,6 @@ describe('JDLWithoutApplicationToJSONConverter', () => { }); it('should add the relationship for the destination entity', () => { expect(relationshipFromDestinationToSource).to.deep.equal({ - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', ownerSide: false, diff --git a/test/jdl/exporters/jhipster-entity-exporter.spec.js b/test/jdl/exporters/jhipster-entity-exporter.spec.js index 4e92e296fd1a..c715ee9c3258 100644 --- a/test/jdl/exporters/jhipster-entity-exporter.spec.js +++ b/test/jdl/exporters/jhipster-entity-exporter.spec.js @@ -205,7 +205,6 @@ describe('JHipsterEntityExporter', () => { relationshipType: 'many-to-one', relationshipName: 'location', otherEntityName: 'location', - otherEntityField: 'id', }, ], changelogDate: '20180303092308', @@ -273,7 +272,6 @@ describe('JHipsterEntityExporter', () => { relationshipType: 'many-to-one', relationshipName: 'store', otherEntityName: 'localStore', - otherEntityField: 'id', }, ], changelogDate: '20180303092311', @@ -306,7 +304,6 @@ describe('JHipsterEntityExporter', () => { relationshipType: 'many-to-one', relationshipName: 'location', otherEntityName: 'location', - otherEntityField: 'id', }, ], changelogDate: '20180303092308', @@ -374,7 +371,6 @@ describe('JHipsterEntityExporter', () => { relationshipType: 'many-to-one', relationshipName: 'store', otherEntityName: 'localStore', - otherEntityField: 'id', }, ], changelogDate: '20180303092311', diff --git a/test/jdl/jdl-importer.spec.js b/test/jdl/jdl-importer.spec.js index 6d7554b8955a..8662975a4c8a 100644 --- a/test/jdl/jdl-importer.spec.js +++ b/test/jdl/jdl-importer.spec.js @@ -66,7 +66,6 @@ describe('JDLImporter', () => { relationshipName: 'location', otherEntityName: 'location', relationshipType: 'many-to-one', - otherEntityField: 'id', otherEntityRelationshipName: 'country', }, ], @@ -115,20 +114,17 @@ describe('JDLImporter', () => { relationshipType: 'one-to-one', relationshipName: 'location', otherEntityName: 'location', - otherEntityField: 'id', ownerSide: true, otherEntityRelationshipName: 'department', }, { relationshipType: 'one-to-many', javadoc: 'A relationship', - otherEntityField: 'id', relationshipName: 'employee', otherEntityName: 'employee', otherEntityRelationshipName: 'department', }, { - otherEntityField: 'id', otherEntityName: 'jobHistory', otherEntityRelationshipName: 'department', ownerSide: false, @@ -183,7 +179,6 @@ describe('JDLImporter', () => { ], relationships: [ { - otherEntityField: 'id', relationshipType: 'one-to-many', relationshipName: 'job', otherEntityName: 'job', @@ -209,10 +204,8 @@ describe('JDLImporter', () => { relationshipName: 'department', otherEntityName: 'department', otherEntityRelationshipName: 'employee', - otherEntityField: 'id', }, { - otherEntityField: 'id', otherEntityName: 'jobHistory', otherEntityRelationshipName: 'emp', ownerSide: false, @@ -278,7 +271,6 @@ describe('JDLImporter', () => { relationshipName: 'history', otherEntityName: 'jobHistory', otherEntityRelationshipName: 'job', - otherEntityField: 'id', ownerSide: false, }, ], @@ -321,7 +313,6 @@ describe('JDLImporter', () => { otherEntityRelationshipName: 'jobHistory', relationshipName: 'department', otherEntityName: 'department', - otherEntityField: 'id', ownerSide: true, }, { @@ -329,7 +320,6 @@ describe('JDLImporter', () => { otherEntityRelationshipName: 'history', relationshipName: 'job', otherEntityName: 'job', - otherEntityField: 'id', ownerSide: true, }, { @@ -375,7 +365,6 @@ describe('JDLImporter', () => { ], relationships: [ { - otherEntityField: 'id', relationshipType: 'one-to-many', relationshipName: 'country', otherEntityName: 'country', @@ -385,7 +374,6 @@ describe('JDLImporter', () => { options: { id: true, }, - otherEntityField: 'id', otherEntityName: 'department', otherEntityRelationshipName: 'location', ownerSide: false, @@ -419,7 +407,6 @@ describe('JDLImporter', () => { otherEntityName: 'country', otherEntityRelationshipName: 'area', relationshipType: 'many-to-one', - otherEntityField: 'id', }, ], name: 'Region', @@ -2055,7 +2042,6 @@ relationship OneToOne { it('should export them', () => { expect(relationshipOnSource).to.deep.equal({ options: { notId: 'value', something: true }, - otherEntityField: 'id', otherEntityName: 'b', otherEntityRelationshipName: 'a', ownerSide: true, @@ -2065,7 +2051,6 @@ relationship OneToOne { }); expect(relationshipOnDestination).to.deep.equal({ options: { id: true }, - otherEntityField: 'id', otherEntityName: 'a', otherEntityRelationshipName: 'b', ownerSide: false, diff --git a/test/jdl/test-files/jhipster_app/.jhipster/Country.json b/test/jdl/test-files/jhipster_app/.jhipster/Country.json index 1275f44a2c7c..8546dc25be47 100644 --- a/test/jdl/test-files/jhipster_app/.jhipster/Country.json +++ b/test/jdl/test-files/jhipster_app/.jhipster/Country.json @@ -5,7 +5,6 @@ "relationshipType": "one-to-one", "relationshipName": "region", "otherEntityName": "region", - "otherEntityField": "id", "ownerSide": true, "useJPADerivedIdentifier": true, "otherEntityRelationshipName": "country" @@ -14,7 +13,6 @@ "relationshipType": "one-to-one", "relationshipName": "user", "otherEntityName": "user", - "otherEntityField": "id", "ownerSide": true, "otherEntityRelationshipName": "country" } diff --git a/test/jdl/test-files/jhipster_app/.jhipster/Department.json b/test/jdl/test-files/jhipster_app/.jhipster/Department.json index 690286f33380..3018f4d70f3d 100644 --- a/test/jdl/test-files/jhipster_app/.jhipster/Department.json +++ b/test/jdl/test-files/jhipster_app/.jhipster/Department.json @@ -5,7 +5,6 @@ "relationshipType": "one-to-one", "relationshipName": "location", "otherEntityName": "location", - "otherEntityField": "id", "ownerSide": true, "otherEntityRelationshipName": "department" }, @@ -18,7 +17,6 @@ "otherEntityRelationshipName": "department" }, { - "otherEntityField": "id", "otherEntityName": "jobHistory", "otherEntityRelationshipName": "department", "ownerSide": false, diff --git a/test/jdl/test-files/jhipster_app/.jhipster/Employee.json b/test/jdl/test-files/jhipster_app/.jhipster/Employee.json index 62f2ff7b59b9..b8d444054a90 100644 --- a/test/jdl/test-files/jhipster_app/.jhipster/Employee.json +++ b/test/jdl/test-files/jhipster_app/.jhipster/Employee.json @@ -16,8 +16,7 @@ { "relationshipType": "many-to-one", "relationshipName": "manager", - "otherEntityName": "employee", - "otherEntityField": "id" + "otherEntityName": "employee" } ], "fields": [ diff --git a/test/jdl/test-files/jhipster_app/.jhipster/Job.json b/test/jdl/test-files/jhipster_app/.jhipster/Job.json index 610136065bb4..6bdec26a88a5 100644 --- a/test/jdl/test-files/jhipster_app/.jhipster/Job.json +++ b/test/jdl/test-files/jhipster_app/.jhipster/Job.json @@ -4,8 +4,7 @@ { "relationshipName": "employee", "otherEntityName": "employee", - "relationshipType": "many-to-one", - "otherEntityField": "id" + "relationshipType": "many-to-one" }, { "relationshipType": "many-to-many", diff --git a/test/jdl/test-files/jhipster_app/.jhipster/JobHistory.json b/test/jdl/test-files/jhipster_app/.jhipster/JobHistory.json index d0bcc32686cd..4cab0d0ef1aa 100644 --- a/test/jdl/test-files/jhipster_app/.jhipster/JobHistory.json +++ b/test/jdl/test-files/jhipster_app/.jhipster/JobHistory.json @@ -5,7 +5,6 @@ "relationshipType": "one-to-one", "relationshipName": "job", "otherEntityName": "job", - "otherEntityField": "id", "ownerSide": true, "otherEntityRelationshipName": "jobHistory" }, @@ -13,7 +12,6 @@ "relationshipType": "one-to-one", "relationshipName": "department", "otherEntityName": "department", - "otherEntityField": "id", "ownerSide": true, "otherEntityRelationshipName": "jobHistory" }, @@ -21,7 +19,6 @@ "relationshipType": "one-to-one", "relationshipName": "employee", "otherEntityName": "employee", - "otherEntityField": "id", "ownerSide": true, "otherEntityRelationshipName": "jobHistory" } diff --git a/test/jdl/test-files/jhipster_app/.jhipster/Location.json b/test/jdl/test-files/jhipster_app/.jhipster/Location.json index c8eaa1534538..acff96cecd97 100644 --- a/test/jdl/test-files/jhipster_app/.jhipster/Location.json +++ b/test/jdl/test-files/jhipster_app/.jhipster/Location.json @@ -5,7 +5,6 @@ "relationshipType": "one-to-one", "relationshipName": "country", "otherEntityName": "country", - "otherEntityField": "id", "ownerSide": true, "otherEntityRelationshipName": "location" } diff --git a/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Country.json b/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Country.json index 540fb1f941ce..259779727bbc 100644 --- a/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Country.json +++ b/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Country.json @@ -7,7 +7,6 @@ "relationshipValidateRules": "required", "relationshipName": "region", "otherEntityName": "region", - "otherEntityField": "id", "ownerSide": true, "otherEntityRelationshipName": "country" } diff --git a/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Department.json b/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Department.json index e292319b0705..31bb901bed2c 100644 --- a/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Department.json +++ b/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Department.json @@ -13,7 +13,6 @@ "relationshipValidateRules": "required", "relationshipName": "location", "otherEntityName": "location", - "otherEntityField": "id", "ownerSide": true, "otherEntityRelationshipName": "department" } diff --git a/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json b/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json index 9cc9f1432125..3e0cc087cb38 100644 --- a/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json +++ b/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Employee.json @@ -5,8 +5,7 @@ { "relationshipName": "department", "otherEntityName": "department", - "relationshipType": "many-to-one", - "otherEntityField": "id" + "relationshipType": "many-to-one" }, { "relationshipType": "one-to-many", @@ -17,8 +16,7 @@ { "relationshipType": "many-to-one", "relationshipName": "manager", - "otherEntityName": "employee", - "otherEntityField": "id" + "otherEntityName": "employee" } ], "fields": [ diff --git a/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Job.json b/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Job.json index feb9afddb329..39b1294746de 100644 --- a/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Job.json +++ b/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Job.json @@ -7,14 +7,12 @@ "otherEntityRelationshipName": "job", "relationshipName": "task", "otherEntityName": "task", - "otherEntityField": "id", "ownerSide": true }, { "relationshipName": "employee", "otherEntityName": "employee", - "relationshipType": "many-to-one", - "otherEntityField": "id" + "relationshipType": "many-to-one" } ], "fields": [ diff --git a/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json b/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json index a6d57239b4a3..d5dbf94bff17 100644 --- a/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json +++ b/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/JobHistory.json @@ -7,7 +7,6 @@ "relationshipValidateRules": "required", "relationshipName": "department", "otherEntityName": "department", - "otherEntityField": "id", "ownerSide": true, "otherEntityRelationshipName": "jobHistory" }, @@ -16,7 +15,6 @@ "relationshipValidateRules": "required", "relationshipName": "job", "otherEntityName": "job", - "otherEntityField": "id", "ownerSide": true, "otherEntityRelationshipName": "jobHistory" }, @@ -25,7 +23,6 @@ "relationshipValidateRules": "required", "relationshipName": "employee", "otherEntityName": "employee", - "otherEntityField": "id", "ownerSide": true, "otherEntityRelationshipName": "jobHistory" } diff --git a/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Location.json b/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Location.json index 328a6d88f970..fc7d7e73c8a7 100644 --- a/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Location.json +++ b/test/jdl/test-files/json_to_jdl_converter/app_with_entities/.jhipster/Location.json @@ -7,7 +7,6 @@ "relationshipValidateRules": "required", "relationshipName": "country", "otherEntityName": "country", - "otherEntityField": "id", "ownerSide": true, "otherEntityRelationshipName": "location" } diff --git a/test/jdl/test-files/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json b/test/jdl/test-files/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json index 328a6d88f970..fc7d7e73c8a7 100644 --- a/test/jdl/test-files/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json +++ b/test/jdl/test-files/json_to_jdl_converter/multi_apps/app2/.jhipster/Location.json @@ -7,7 +7,6 @@ "relationshipValidateRules": "required", "relationshipName": "country", "otherEntityName": "country", - "otherEntityField": "id", "ownerSide": true, "otherEntityRelationshipName": "location" } From b3b32b41b1c27fe040cf5d7f6875238ab98ab071 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Dec 2020 06:19:33 +0000 Subject: [PATCH 0074/1179] chore(deps): bump bootstrap-vue in /generators/client/templates/vue Bumps [bootstrap-vue](https://github.com/bootstrap-vue/bootstrap-vue) from 2.19.0 to 2.20.1. - [Release notes](https://github.com/bootstrap-vue/bootstrap-vue/releases) - [Changelog](https://github.com/bootstrap-vue/bootstrap-vue/blob/dev/CHANGELOG.md) - [Commits](https://github.com/bootstrap-vue/bootstrap-vue/compare/v2.19.0...v2.20.1) Signed-off-by: dependabot[bot] --- generators/client/templates/vue/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/templates/vue/package.json b/generators/client/templates/vue/package.json index 56f864dd75af..2de74c67388d 100644 --- a/generators/client/templates/vue/package.json +++ b/generators/client/templates/vue/package.json @@ -7,7 +7,7 @@ "axios": "0.21.0", "bootstrap": "4.5.3", "bootswatch": "4.5.3", - "bootstrap-vue": "2.19.0" + "bootstrap-vue": "2.20.1" }, "devDependencies": { "webpack": "4.44.2", From 0b63a4d98e6ee7ccd76f13709a4e02ab6b89b47b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Dec 2020 06:29:40 +0000 Subject: [PATCH 0075/1179] chore(deps): bump ngx-cookie-service Bumps [ngx-cookie-service](https://github.com/stevermeister/ngx-cookie-service) from 10.1.1 to 11.0.2. - [Release notes](https://github.com/stevermeister/ngx-cookie-service/releases) - [Changelog](https://github.com/stevermeister/ngx-cookie-service/blob/master/CHANGELOG.md) - [Commits](https://github.com/stevermeister/ngx-cookie-service/commits) Signed-off-by: dependabot[bot] --- generators/client/templates/angular/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/templates/angular/package.json b/generators/client/templates/angular/package.json index fd7f8a95393e..267b42df5b78 100644 --- a/generators/client/templates/angular/package.json +++ b/generators/client/templates/angular/package.json @@ -8,7 +8,7 @@ "@ng-bootstrap/ng-bootstrap": "8.0.0", "@ngx-translate/core": "13.0.0", "@ngx-translate/http-loader": "6.0.0", - "ngx-cookie-service": "10.1.1", + "ngx-cookie-service": "11.0.2", "ngx-infinite-scroll": "10.0.0", "ngx-webstorage": "6.0.0", "rxjs": "6.6.3", From f1c9af70cdb40d38d48c44618ad1a14e9fdc7e97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Dec 2020 06:32:25 +0000 Subject: [PATCH 0076/1179] chore(deps-dev): bump @types/jest Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 26.0.15 to 26.0.16. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest) Signed-off-by: dependabot[bot] --- generators/client/templates/angular/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/templates/angular/package.json b/generators/client/templates/angular/package.json index fd7f8a95393e..cec359cf47fc 100644 --- a/generators/client/templates/angular/package.json +++ b/generators/client/templates/angular/package.json @@ -20,7 +20,7 @@ "@angular/cli": "11.0.2", "@angular-builders/custom-webpack": "11.0.0-beta.1", "@angular-eslint/eslint-plugin": "0.6.0-beta.0", - "@types/jest": "26.0.15", + "@types/jest": "26.0.16", "@typescript-eslint/eslint-plugin": "4.9.0", "browser-sync": "2.26.13", "browser-sync-webpack-plugin": "2.2.2", From 6393a0117aec69d5d99d7ccd57b349955ff79d43 Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Wed, 2 Dec 2020 14:52:03 +0200 Subject: [PATCH 0077/1179] [angular] Fix UserRouteAccessService This PR fixes the following problems related to UserRouteAccessService and it's usages. Some routes required USER role, but data shown in those routes and operations done there are allowed in back end without role restriction. Developer can assume that if route is protected in front end then data and operations related to this route should be protected also in back end and this can lead to security issues. This PR removes role restrictions from such routes in the front end. If developer defines routes without restricting those to some roles then UserRouteAccessService allowed unauthenticated users to go to that page (but page was empty). Correct is to route to login page and after successful login user is landing in requested page as this is after this PR. --- .../app/account/activate/activate.route.ts.ejs | 1 - .../finish/password-reset-finish.route.ts.ejs | 1 - .../init/password-reset-init.route.ts.ejs | 1 - .../app/account/password/password.route.ts.ejs | 2 -- .../app/account/register/register.route.ts.ejs | 1 - .../app/account/sessions/sessions.route.ts.ejs | 2 -- .../app/account/settings/settings.route.ts.ejs | 2 -- .../core/auth/user-route-access.service.ts.ejs | 18 ++++++++---------- .../src/main/webapp/app/home/home.route.ts.ejs | 1 - .../app/layouts/error/error.route.ts.ejs | 3 --- .../main/webapp/app/login/login.route.ts.ejs | 1 - .../entity-management-routing.module.ts.ejs | 5 ----- 12 files changed, 8 insertions(+), 30 deletions(-) diff --git a/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.route.ts.ejs index 41af155db1ea..ce60ebb23c63 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.route.ts.ejs @@ -24,7 +24,6 @@ export const activateRoute: Route = { path: 'activate', component: ActivateComponent, data: { - authorities: [], pageTitle: 'activate.title', }, }; diff --git a/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts.ejs index b3002d399dac..804bf9692554 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts.ejs @@ -24,7 +24,6 @@ export const passwordResetFinishRoute: Route = { path: 'reset/finish', component: PasswordResetFinishComponent, data: { - authorities: [], pageTitle: 'global.menu.account.password', }, }; diff --git a/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts.ejs index 73daef1ab6b3..37713c05a078 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts.ejs @@ -24,7 +24,6 @@ export const passwordResetInitRoute: Route = { path: 'reset/request', component: PasswordResetInitComponent, data: { - authorities: [], pageTitle: 'global.menu.account.password', }, }; diff --git a/generators/client/templates/angular/src/main/webapp/app/account/password/password.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password.route.ts.ejs index 0a2853034814..422de4e25b09 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password/password.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password/password.route.ts.ejs @@ -20,13 +20,11 @@ import { Route } from '@angular/router'; import { UserRouteAccessService } from 'app/core/auth/user-route-access.service'; import { PasswordComponent } from './password.component'; -import { Authority } from 'app/config/authority.constants'; export const passwordRoute: Route = { path: 'password', component: PasswordComponent, data: { - authorities: [Authority.USER], pageTitle: 'global.menu.account.password', }, canActivate: [UserRouteAccessService], diff --git a/generators/client/templates/angular/src/main/webapp/app/account/register/register.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/register/register.route.ts.ejs index 3eecf1384475..f74b586ec25e 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/register/register.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/register/register.route.ts.ejs @@ -24,7 +24,6 @@ export const registerRoute: Route = { path: 'register', component: RegisterComponent, data: { - authorities: [], pageTitle: 'register.title', }, }; diff --git a/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.route.ts.ejs index d5cd1d98acbb..f87a4ab16a86 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.route.ts.ejs @@ -18,7 +18,6 @@ -%> import { Route } from '@angular/router'; -import { Authority } from 'app/config/authority.constants'; import { UserRouteAccessService } from 'app/core/auth/user-route-access.service'; import { SessionsComponent } from './sessions.component'; @@ -26,7 +25,6 @@ export const sessionsRoute: Route = { path: 'sessions', component: SessionsComponent, data: { - authorities: [Authority.USER], pageTitle: 'global.menu.account.sessions', }, canActivate: [UserRouteAccessService], diff --git a/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.route.ts.ejs index 8a7b7670e7fa..9a89745ba37a 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.route.ts.ejs @@ -20,13 +20,11 @@ import { Route } from '@angular/router'; import { UserRouteAccessService } from 'app/core/auth/user-route-access.service'; import { SettingsComponent } from './settings.component'; -import { Authority } from 'app/config/authority.constants'; export const settingsRoute: Route = { path: 'settings', component: SettingsComponent, data: { - authorities: [Authority.USER], pageTitle: 'global.menu.account.settings', }, canActivate: [UserRouteAccessService], diff --git a/generators/client/templates/angular/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs index 3e2949923299..6e5efaf9ae50 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs @@ -39,21 +39,19 @@ export class UserRouteAccessService implements CanActivate { ) {} canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { - const authorities = route.data['authorities']; - // We need to call the accountService.identity() function, to ensure, - // that the client has a principal too, if they already logged in by the server. - // This could happen on a page refresh. return this.accountService.identity().pipe( map(account => { - if (!authorities || authorities.length === 0) { - return true; - } - if (account) { - const hasAnyAuthority = this.accountService.hasAnyAuthority(authorities); - if (hasAnyAuthority) { + const authorities = route.data['authorities']; + + if (!authorities || authorities.length === 0) { return true; } + + if (this.accountService.hasAnyAuthority(authorities)) { + return true; + } + if (isDevMode()) { console.error('User has not any of required authorities: ', authorities); } diff --git a/generators/client/templates/angular/src/main/webapp/app/home/home.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/home/home.route.ts.ejs index 7c88241430e4..f85d37bdcea1 100644 --- a/generators/client/templates/angular/src/main/webapp/app/home/home.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/home/home.route.ts.ejs @@ -24,7 +24,6 @@ export const HOME_ROUTE: Route = { path: '', component: HomeComponent, data: { - authorities: [], pageTitle: 'home.title', }, }; diff --git a/generators/client/templates/angular/src/main/webapp/app/layouts/error/error.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/error/error.route.ts.ejs index 52a6f3c385d7..adb6e4c1b295 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/error/error.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/error/error.route.ts.ejs @@ -25,7 +25,6 @@ export const errorRoute: Routes = [ path: 'error', component: ErrorComponent, data: { - authorities: [], pageTitle: 'error.title', }, }, @@ -33,7 +32,6 @@ export const errorRoute: Routes = [ path: 'accessdenied', component: ErrorComponent, data: { - authorities: [], pageTitle: 'error.title', errorMessage: 'error.http.403', }, @@ -42,7 +40,6 @@ export const errorRoute: Routes = [ path: '404', component: ErrorComponent, data: { - authorities: [], pageTitle: 'error.title', errorMessage: 'error.http.404', }, diff --git a/generators/client/templates/angular/src/main/webapp/app/login/login.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/login/login.route.ts.ejs index 28e8ad484abf..07394aac7fc5 100644 --- a/generators/client/templates/angular/src/main/webapp/app/login/login.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/login/login.route.ts.ejs @@ -23,7 +23,6 @@ export const LOGIN_ROUTE: Route = { path: '', component: LoginComponent, data: { - authorities: [], pageTitle: 'login.title', }, }; diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs index 1e6da2b1dc66..1003da7ff006 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs @@ -20,7 +20,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { Authority } from 'app/config/authority.constants'; import { UserRouteAccessService } from 'app/core/auth/user-route-access.service'; import { <%= entityAngularName %>Component } from './list/<%= entityFileName %>.component'; import { <%= entityAngularName %>DetailComponent } from './detail/<%= entityFileName %>-detail.component'; @@ -35,7 +34,6 @@ const <%= entityInstance %>Route: Routes = [ path: '', component: <%= entityAngularName %>Component, data: { - authorities: [Authority.USER], <%_ if (pagination === 'pagination') { _%> defaultSort: 'id,asc', <%_ } _%> @@ -50,7 +48,6 @@ const <%= entityInstance %>Route: Routes = [ <%= entityInstance %>: <%= entityAngularName %>RoutingResolveService }, data: { - authorities: [Authority.USER], pageTitle: <% if (enableTranslation) { %>'<%= i18nKeyPrefix %>.home.title'<% } else { %>'<%= entityClassPlural %>'<% } %> }, canActivate: [UserRouteAccessService] @@ -63,7 +60,6 @@ const <%= entityInstance %>Route: Routes = [ <%= entityInstance %>: <%= entityAngularName %>RoutingResolveService }, data: { - authorities: [Authority.USER], pageTitle: <% if (enableTranslation) { %>'<%= i18nKeyPrefix %>.home.title'<% } else { %>'<%= entityClassPlural %>'<% } %> }, canActivate: [UserRouteAccessService] @@ -75,7 +71,6 @@ const <%= entityInstance %>Route: Routes = [ <%= entityInstance %>: <%= entityAngularName %>RoutingResolveService }, data: { - authorities: [Authority.USER], pageTitle: <% if (enableTranslation) { %>'<%= i18nKeyPrefix %>.home.title'<% } else { %>'<%= entityClassPlural %>'<% } %> }, canActivate: [UserRouteAccessService] From b5f2152950fde63257f90c264319ceb059758d29 Mon Sep 17 00:00:00 2001 From: jh64 <48374211+jh64@users.noreply.github.com> Date: Thu, 3 Dec 2020 12:31:59 +1100 Subject: [PATCH 0078/1179] fixed 2 syntax issues in jhipster-registry.yml, found on CodeReady/crc 4.6.1. --- .../openshift/templates/registry/jhipster-registry.yml.ejs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/generators/openshift/templates/registry/jhipster-registry.yml.ejs b/generators/openshift/templates/registry/jhipster-registry.yml.ejs index 161e96b29d47..439d8ac85d54 100644 --- a/generators/openshift/templates/registry/jhipster-registry.yml.ejs +++ b/generators/openshift/templates/registry/jhipster-registry.yml.ejs @@ -67,8 +67,11 @@ objects: metadata: name: ${APPLICATION_NAME} spec: + selector: + matchLabels: + app: ${APPLICATION_NAME} serviceName: ${APPLICATION_NAME} - replicas: "<%= registryReplicas %>" + replicas: <%= registryReplicas %> template: metadata: labels: From 51f2fad1a3c5c7238de17fc61b66080b2af9734f Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Thu, 3 Dec 2020 05:20:20 +0200 Subject: [PATCH 0079/1179] [angular] Remove one line methods for refresh --- .../list/user-management.component.html.ejs | 2 +- .../list/user-management.component.ts.ejs | 34 ++++++++----------- .../list/entity-management.component.html.ejs | 12 ++++++- .../list/infinite-scroll-template.ejs | 4 --- .../entities/list/no-pagination-template.ejs | 4 --- .../app/entities/list/pagination-template.ejs | 4 --- 6 files changed, 27 insertions(+), 33 deletions(-) diff --git a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs index 5018df92501e..558bc2451d0c 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs @@ -21,7 +21,7 @@ Translate="userManagement.home.title" data-cy="userManagementPageHeading">Users
- diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/infinite-scroll-template.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/infinite-scroll-template.ejs index 36fd2bcb07f6..ad0eb12ac059 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/infinite-scroll-template.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/infinite-scroll-template.ejs @@ -101,10 +101,6 @@ this.loadAll(); } - handleSyncList(): void { - this.reset(); - } - <%_ if (searchEngine !== false) { _%> search(query: string): void { this.<%= entityInstancePlural %> = []; diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/no-pagination-template.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/no-pagination-template.ejs index c5a9812df026..e62630fe867a 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/no-pagination-template.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/no-pagination-template.ejs @@ -69,10 +69,6 @@ ); } - handleSyncList(): void { - this.loadAll(); - } - <%_ if (searchEngine !== false) { _%> search(query: string): void { this.currentSearch = query; diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/pagination-template.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/pagination-template.ejs index 2038c41275cc..a8aac3157ce5 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/pagination-template.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/pagination-template.ejs @@ -83,10 +83,6 @@ ); } - handleSyncList(): void { - this.loadPage(); - } - <%_ if (searchEngine !== false) { _%> search(query: string): void { this.currentSearch = query; From 488255e808e302592aeb183f7162323584aaaacc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Dec 2020 06:29:43 +0000 Subject: [PATCH 0080/1179] chore(deps): bump @angular/common Bumps [@angular/common](https://github.com/angular/angular/tree/HEAD/packages/common) from 11.0.2 to 11.0.3. - [Release notes](https://github.com/angular/angular/releases) - [Changelog](https://github.com/angular/angular/blob/11.0.3/CHANGELOG.md) - [Commits](https://github.com/angular/angular/commits/11.0.3/packages/common) Signed-off-by: dependabot[bot] --- generators/client/templates/angular/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/templates/angular/package.json b/generators/client/templates/angular/package.json index b6a90764cdb6..9a5f148313cf 100644 --- a/generators/client/templates/angular/package.json +++ b/generators/client/templates/angular/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "@angular/common": "11.0.2", + "@angular/common": "11.0.3", "bootstrap": "4.5.3", "@fortawesome/angular-fontawesome": "0.8.0", "@fortawesome/fontawesome-svg-core": "1.2.32", From cda76e75d7595ec513e7ab6d4aff7022a9606b25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Dec 2020 06:32:43 +0000 Subject: [PATCH 0081/1179] chore(deps-dev): bump @angular/cli Bumps [@angular/cli](https://github.com/angular/angular-cli) from 11.0.2 to 11.0.3. - [Release notes](https://github.com/angular/angular-cli/releases) - [Commits](https://github.com/angular/angular-cli/compare/v11.0.2...v11.0.3) Signed-off-by: dependabot[bot] --- generators/client/templates/angular/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/templates/angular/package.json b/generators/client/templates/angular/package.json index b6a90764cdb6..330a1247ffa4 100644 --- a/generators/client/templates/angular/package.json +++ b/generators/client/templates/angular/package.json @@ -17,7 +17,7 @@ "zone.js": "0.10.3" }, "devDependencies": { - "@angular/cli": "11.0.2", + "@angular/cli": "11.0.3", "@angular-builders/custom-webpack": "11.0.0-beta.1", "@angular-eslint/eslint-plugin": "0.6.0-beta.0", "@types/jest": "26.0.16", From e847685d8f50ab1f1464a8d79a14433443e79c18 Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Thu, 3 Dec 2020 14:27:15 +0200 Subject: [PATCH 0082/1179] Change license copy obtain link from http to https Changed license copy obtain link in license headers from http://www.apache.org/licenses/LICENSE-2.0 to https://www.apache.org/licenses/LICENSE-2.0 This is suggested also in Apache license FAQ: https://www.apache.org/foundation/license-faq.html#Apply-My-Software And Gradle Wrapper also uses https version of this license link (Maven Wrapper still uses http version). Made also some polishing in license headers. Changed some https://jhipster.github.io/ to https://www.jhipster.tech/ Changed some http://www.jhipster.tech/ to https://www.jhipster.tech/ Unified also spacing in licence headers. Updated some licence headers to the latest version: * changed "Copyright 2013-2020 the original author or authors." to "Copyright 2013-2020 the original author or authors from the JHipster project." * changed "2013-2018" to "2013-2020" * changed "http://www.apache.org/licenses/LICENSE-2.0 = 0" to "https://www.apache.org/licenses/LICENSE-2.0" --- .github/workflows/angular.yml | 2 +- .github/workflows/generator.yml | 2 +- .../workflows/gradle-wrapper-validation.yml | 2 +- .github/workflows/incremental-changelog.yml | 2 +- .github/workflows/label-cleanup.yml | 2 +- .github/workflows/react.yml | 2 +- .github/workflows/triage.yml | 2 +- .github/workflows/vue.yml | 2 +- .github/workflows/webflux.yml | 2 +- LICENSE.txt | 2 +- azure-pipelines.yml | 2 +- cli/cli.js | 2 +- cli/commands.js | 2 +- cli/download.js | 2 +- cli/environment-builder.js | 2 +- cli/import-jdl.js | 2 +- cli/jdl.js | 2 +- cli/jhipster-command.js | 2 +- cli/jhipster.js | 2 +- cli/program.js | 2 +- cli/utils.js | 2 +- generators/app/index.js | 2 +- generators/app/prompts.js | 2 +- generators/aws-containers/aws-client.js | 2 +- generators/aws-containers/index.js | 2 +- .../aws-containers/lib/cloudFormation.js | 2 +- generators/aws-containers/lib/ecr.js | 2 +- generators/aws-containers/lib/ssm.js | 2 +- generators/aws-containers/lib/utils.js | 2 +- generators/aws-containers/prompts.js | 2 +- .../templates/AwsSSMConfiguration.java.ejs | 2 +- .../templates/application.template.yml.ejs | 2 +- .../templates/base.template.yml.ejs | 2 +- .../templates/bootstrap-aws.yml.ejs | 2 +- generators/aws/index.js | 2 +- generators/aws/lib/aws.js | 2 +- generators/aws/lib/eb.js | 2 +- generators/aws/lib/iam.js | 2 +- generators/aws/lib/rds.js | 2 +- generators/aws/lib/s3.js | 2 +- generators/aws/prompts.js | 2 +- generators/azure-app-service/index.js | 2 +- .../templates/application-azure.yml.ejs | 2 +- generators/azure-spring-cloud/index.js | 2 +- .../templates/application-azure.yml.ejs | 2 +- .../templates/bootstrap-azure.yml.ejs | 2 +- generators/ci-cd/index.js | 2 +- generators/ci-cd/prompts.js | 2 +- generators/ci-cd/templates/.gitlab-ci.yml.ejs | 2 +- .../ci-cd/templates/azure-pipelines.yml.ejs | 2 +- generators/ci-cd/templates/circle.yml.ejs | 2 +- .../ci-cd/templates/docker-registry.yml.ejs | 2 +- generators/ci-cd/templates/github-ci.yml.ejs | 2 +- .../ci-cd/templates/jenkins/Jenkinsfile.ejs | 2 +- .../ci-cd/templates/jenkins/jenkins.yml.ejs | 2 +- generators/ci-cd/templates/travis.yml.ejs | 2 +- generators/cleanup.js | 2 +- generators/client/files-angular.js | 2 +- generators/client/files-common.js | 2 +- generators/client/files-react.js | 4 +-- generators/client/files-vue.js | 2 +- generators/client/index.js | 2 +- .../needle-api/needle-client-angular.js | 2 +- .../client/needle-api/needle-client-i18n.js | 2 +- .../client/needle-api/needle-client-react.js | 2 +- .../client/needle-api/needle-client-vue.js | 2 +- .../needle-api/needle-client-webpack.js | 2 +- generators/client/needle-api/needle-client.js | 2 +- generators/client/prompts.js | 2 +- .../templates/angular/.browserslistrc.ejs | 2 +- .../templates/angular/.eslintrc.json.ejs | 2 +- .../client/templates/angular/angular.json.ejs | 2 +- .../client/templates/angular/jest.conf.js.ejs | 2 +- .../client/templates/angular/package.json.ejs | 24 +++++++------- .../angular/src/main/webapp/404.html.ejs | 2 +- .../webapp/app/account/account.module.ts.ejs | 2 +- .../webapp/app/account/account.route.ts.ejs | 2 +- .../activate/activate.component.html.ejs | 2 +- .../activate/activate.component.spec.ts.ejs | 2 +- .../activate/activate.component.ts.ejs | 2 +- .../account/activate/activate.route.ts.ejs | 2 +- .../account/activate/activate.service.ts.ejs | 2 +- .../password-reset-finish.component.html.ejs | 2 +- ...assword-reset-finish.component.spec.ts.ejs | 2 +- .../password-reset-finish.component.ts.ejs | 2 +- .../finish/password-reset-finish.route.ts.ejs | 2 +- .../password-reset-finish.service.ts.ejs | 2 +- .../password-reset-init.component.html.ejs | 2 +- .../password-reset-init.component.spec.ts.ejs | 2 +- .../init/password-reset-init.component.ts.ejs | 2 +- .../init/password-reset-init.route.ts.ejs | 2 +- .../init/password-reset-init.service.ts.ejs | 2 +- .../password-strength-bar.component.html.ejs | 2 +- .../password-strength-bar.component.scss.ejs | 2 +- ...assword-strength-bar.component.spec.ts.ejs | 2 +- .../password-strength-bar.component.ts.ejs | 2 +- .../password/password.component.html.ejs | 2 +- .../password/password.component.spec.ts.ejs | 2 +- .../password/password.component.ts.ejs | 2 +- .../account/password/password.route.ts.ejs | 2 +- .../account/password/password.service.ts.ejs | 2 +- .../register/register.component.html.ejs | 2 +- .../register/register.component.spec.ts.ejs | 2 +- .../register/register.component.ts.ejs | 2 +- .../account/register/register.route.ts.ejs | 2 +- .../account/register/register.service.ts.ejs | 2 +- .../app/account/sessions/session.model.ts.ejs | 2 +- .../sessions/sessions.component.html.ejs | 2 +- .../sessions/sessions.component.spec.ts.ejs | 2 +- .../sessions/sessions.component.ts.ejs | 2 +- .../account/sessions/sessions.route.ts.ejs | 2 +- .../account/sessions/sessions.service.ts.ejs | 2 +- .../settings/settings.component.html.ejs | 2 +- .../settings/settings.component.spec.ts.ejs | 2 +- .../settings/settings.component.ts.ejs | 2 +- .../account/settings/settings.route.ts.ejs | 2 +- .../app/admin/admin-routing.module.ts.ejs | 2 +- .../configuration.component.html.ejs | 2 +- .../configuration.component.spec.ts.ejs | 2 +- .../configuration.component.ts.ejs | 2 +- .../configuration/configuration.model.ts.ejs | 2 +- .../configuration/configuration.module.ts.ejs | 2 +- .../configuration/configuration.route.ts.ejs | 2 +- .../configuration.service.spec.ts.ejs | 2 +- .../configuration.service.ts.ejs | 2 +- .../app/admin/docs/docs.component.html.ejs | 2 +- .../app/admin/docs/docs.component.scss.ejs | 2 +- .../app/admin/docs/docs.component.ts.ejs | 2 +- .../webapp/app/admin/docs/docs.module.ts.ejs | 2 +- .../webapp/app/admin/docs/docs.route.ts.ejs | 2 +- .../admin/gateway/gateway-route.model.ts.ejs | 2 +- .../gateway/gateway-routes.service.ts.ejs | 2 +- .../admin/gateway/gateway.component.html.ejs | 2 +- .../admin/gateway/gateway.component.ts.ejs | 2 +- .../app/admin/gateway/gateway.module.ts.ejs | 2 +- .../app/admin/gateway/gateway.route.ts.ejs | 2 +- .../admin/health/health.component.html.ejs | 2 +- .../admin/health/health.component.spec.ts.ejs | 2 +- .../app/admin/health/health.component.ts.ejs | 2 +- .../app/admin/health/health.model.ts.ejs | 2 +- .../app/admin/health/health.module.ts.ejs | 2 +- .../app/admin/health/health.route.ts.ejs | 2 +- .../app/admin/health/health.service.ts.ejs | 2 +- .../modal/health-modal.component.html.ejs | 2 +- .../modal/health-modal.component.ts.ejs | 2 +- .../webapp/app/admin/logs/log.model.ts.ejs | 2 +- .../app/admin/logs/logs.component.html.ejs | 2 +- .../app/admin/logs/logs.component.spec.ts.ejs | 2 +- .../app/admin/logs/logs.component.ts.ejs | 2 +- .../webapp/app/admin/logs/logs.module.ts.ejs | 2 +- .../webapp/app/admin/logs/logs.route.ts.ejs | 2 +- .../app/admin/logs/logs.service.spec.ts.ejs | 2 +- .../webapp/app/admin/logs/logs.service.ts.ejs | 2 +- .../jvm-memory/jvm-memory.component.html.ejs | 2 +- .../jvm-memory/jvm-memory.component.ts.ejs | 2 +- .../jvm-threads.component.html.ejs | 2 +- .../jvm-threads/jvm-threads.component.ts.ejs | 2 +- .../metrics-cache.component.html.ejs | 2 +- .../metrics-cache.component.ts.ejs | 2 +- .../metrics-datasource.component.html.ejs | 2 +- .../metrics-datasource.component.ts.ejs | 2 +- ...rics-endpoints-requests.component.html.ejs | 2 +- ...etrics-endpoints-requests.component.ts.ejs | 2 +- ...etrics-garbagecollector.component.html.ejs | 2 +- .../metrics-garbagecollector.component.ts.ejs | 2 +- .../metrics-modal-threads.component.html.ejs | 2 +- .../metrics-modal-threads.component.ts.ejs | 2 +- .../metrics-request.component.html.ejs | 2 +- .../metrics-request.component.ts.ejs | 2 +- .../metrics-system.component.html.ejs | 2 +- .../metrics-system.component.ts.ejs | 2 +- .../admin/metrics/metrics.component.html.ejs | 2 +- .../metrics/metrics.component.spec.ts.ejs | 2 +- .../admin/metrics/metrics.component.ts.ejs | 2 +- .../app/admin/metrics/metrics.model.ts.ejs | 2 +- .../app/admin/metrics/metrics.module.ts.ejs | 2 +- .../app/admin/metrics/metrics.route.ts.ejs | 2 +- .../admin/metrics/metrics.service.spec.ts.ejs | 2 +- .../app/admin/metrics/metrics.service.ts.ejs | 2 +- .../admin/tracker/tracker.component.html.ejs | 2 +- .../admin/tracker/tracker.component.ts.ejs | 2 +- .../app/admin/tracker/tracker.module.ts.ejs | 2 +- .../app/admin/tracker/tracker.route.ts.ejs | 2 +- ...anagement-delete-dialog.component.html.ejs | 2 +- ...gement-delete-dialog.component.spec.ts.ejs | 2 +- ...-management-delete-dialog.component.ts.ejs | 2 +- .../user-management-detail.component.html.ejs | 2 +- ...er-management-detail.component.spec.ts.ejs | 2 +- .../user-management-detail.component.ts.ejs | 2 +- .../list/user-management.component.html.ejs | 2 +- .../user-management.component.spec.ts.ejs | 2 +- .../list/user-management.component.ts.ejs | 2 +- .../user-management-update.component.html.ejs | 2 +- ...er-management-update.component.spec.ts.ejs | 2 +- .../user-management-update.component.ts.ejs | 2 +- .../user-management.module.ts.ejs | 2 +- .../user-management.route.ts.ejs | 2 +- .../main/webapp/app/app-routing.module.ts.ejs | 2 +- .../src/main/webapp/app/app.constants.ts.ejs | 2 +- .../src/main/webapp/app/app.module.ts.ejs | 2 +- .../app/config/authority.constants.ts.ejs | 2 +- .../app/config/datepicker-adapter.ts.ejs | 2 +- .../src/main/webapp/app/config/dayjs.ts.ejs | 2 +- .../webapp/app/config/error.constants.ts.ejs | 2 +- .../app/config/font-awesome-icons.ts.ejs | 2 +- .../webapp/app/config/input.constants.ts.ejs | 2 +- .../app/config/language.constants.ts.ejs | 2 +- .../app/config/pagination.constants.ts.ejs | 2 +- .../app/config/translation.config.ts.ejs | 2 +- .../app/config/uib-pagination.config.ts.ejs | 2 +- .../app/core/auth/account.service.spec.ts.ejs | 2 +- .../app/core/auth/account.service.ts.ejs | 2 +- .../app/core/auth/auth-jwt.service.ts.ejs | 2 +- .../app/core/auth/auth-session.service.ts.ejs | 2 +- .../webapp/app/core/auth/csrf.service.ts.ejs | 2 +- .../core/auth/state-storage.service.ts.ejs | 2 +- .../auth/user-route-access.service.ts.ejs | 2 +- .../auth-expired.interceptor.ts.ejs | 2 +- .../core/interceptor/auth.interceptor.ts.ejs | 2 +- .../error-handler.interceptor.ts.ejs | 2 +- .../webapp/app/core/interceptor/index.ts.ejs | 2 +- .../notification.interceptor.ts.ejs | 2 +- .../app/core/request/request-util.ts.ejs | 2 +- .../app/core/request/request.model.ts.ejs | 2 +- .../tracker/tracker-activity.model.ts.ejs | 2 +- .../app/core/tracker/tracker.service.ts.ejs | 2 +- .../webapp/app/core/user/account.model.ts.ejs | 2 +- .../webapp/app/core/user/user.model.ts.ejs | 2 +- .../app/core/user/user.service.spec.ts.ejs | 2 +- .../webapp/app/core/user/user.service.ts.ejs | 2 +- .../app/core/util/alert.service.spec.ts.ejs | 2 +- .../webapp/app/core/util/alert.service.ts.ejs | 2 +- .../core/util/data-util.service.spec.ts.ejs | 2 +- .../app/core/util/data-util.service.ts.ejs | 2 +- .../util/event-manager.service.spec.ts.ejs | 2 +- .../core/util/event-manager.service.ts.ejs | 2 +- .../core/util/parse-links.service.spec.ts.ejs | 2 +- .../app/core/util/parse-links.service.ts.ejs | 2 +- .../app/entities/entity-routing.module.ts.ejs | 2 +- .../webapp/app/home/home.component.html.ejs | 2 +- .../webapp/app/home/home.component.scss.ejs | 2 +- .../app/home/home.component.spec.ts.ejs | 2 +- .../webapp/app/home/home.component.ts.ejs | 2 +- .../main/webapp/app/home/home.module.ts.ejs | 2 +- .../main/webapp/app/home/home.route.ts.ejs | 2 +- .../layouts/error/error.component.html.ejs | 2 +- .../app/layouts/error/error.component.ts.ejs | 2 +- .../app/layouts/error/error.route.ts.ejs | 2 +- .../layouts/footer/footer.component.html.ejs | 2 +- .../layouts/footer/footer.component.ts.ejs | 2 +- .../app/layouts/main/main.component.html.ejs | 2 +- .../layouts/main/main.component.spec.ts.ejs | 2 +- .../app/layouts/main/main.component.ts.ejs | 2 +- .../navbar/active-menu.directive.ts.ejs | 2 +- .../layouts/navbar/navbar.component.html.ejs | 2 +- .../layouts/navbar/navbar.component.scss.ejs | 2 +- .../navbar/navbar.component.spec.ts.ejs | 2 +- .../layouts/navbar/navbar.component.ts.ejs | 2 +- .../app/layouts/navbar/navbar.route.ts.ejs | 2 +- .../profiles/page-ribbon.component.scss.ejs | 2 +- .../profiles/page-ribbon.component.ts.ejs | 2 +- .../profiles/profile-info.model.ts.ejs | 2 +- .../layouts/profiles/profile.service.ts.ejs | 2 +- .../webapp/app/login/login.component.html.ejs | 2 +- .../app/login/login.component.spec.ts.ejs | 2 +- .../webapp/app/login/login.component.ts.ejs | 2 +- .../main/webapp/app/login/login.model.ts.ejs | 2 +- .../main/webapp/app/login/login.module.ts.ejs | 2 +- .../main/webapp/app/login/login.route.ts.ejs | 2 +- .../webapp/app/login/login.service.ts.ejs | 2 +- .../main/webapp/app/login/logout.model.ts.ejs | 2 +- .../alert/alert-error.component.html.ejs | 2 +- .../alert/alert-error.component.spec.ts.ejs | 2 +- .../shared/alert/alert-error.component.ts.ejs | 2 +- .../app/shared/alert/alert-error.model.ts.ejs | 2 +- .../app/shared/alert/alert.component.html.ejs | 2 +- .../shared/alert/alert.component.spec.ts.ejs | 2 +- .../app/shared/alert/alert.component.ts.ejs | 2 +- .../app/shared/date/duration.pipe.ts.ejs | 2 +- .../date/format-medium-date.pipe.spec.ts.ejs | 2 +- .../date/format-medium-date.pipe.ts.ejs | 2 +- .../format-medium-datetime.pipe.spec.ts.ejs | 2 +- .../date/format-medium-datetime.pipe.ts.ejs | 2 +- .../shared/has-any-authority.directive.ts.ejs | 2 +- .../shared/item-count.component.spec.ts.ejs | 2 +- .../app/shared/item-count.component.ts.ejs | 2 +- .../find-language-from-key.pipe.ts.ejs | 2 +- .../language/translate.directive.spec.ts.ejs | 2 +- .../language/translate.directive.ts.ejs | 2 +- .../app/shared/shared-libs.module.ts.ejs | 2 +- .../webapp/app/shared/shared.module.ts.ejs | 2 +- .../shared/sort/sort-by.directive.spec.ts.ejs | 2 +- .../app/shared/sort/sort-by.directive.ts.ejs | 2 +- .../shared/sort/sort.directive.spec.ts.ejs | 2 +- .../app/shared/sort/sort.directive.ts.ejs | 2 +- .../main/webapp/content/css/loading.css.ejs | 2 +- .../scss/_bootstrap-variables.scss.ejs | 2 +- .../main/webapp/content/scss/global.scss.ejs | 2 +- .../main/webapp/content/scss/vendor.scss.ejs | 2 +- .../angular/src/main/webapp/index.html.ejs | 2 +- .../angular/src/main/webapp/main.ts.ejs | 2 +- .../angular/src/main/webapp/polyfills.ts.ejs | 2 +- .../angular/src/main/webapp/robots.txt.ejs | 2 +- .../src/main/webapp/swagger-ui/index.html.ejs | 2 +- .../e2e/account/account.spec.ts.ejs | 2 +- .../e2e/admin/administration.spec.ts.ejs | 2 +- .../e2e/page-objects/jhi-page-objects.ts.ejs | 2 +- .../test/javascript/protractor.conf.js.ejs | 2 +- .../templates/angular/tsconfig.app.json.ejs | 2 +- .../templates/angular/tsconfig.e2e.json.ejs | 2 +- .../templates/angular/tsconfig.json.ejs | 2 +- .../templates/angular/tsconfig.spec.json.ejs | 2 +- .../angular/webpack/proxy.conf.js.ejs | 2 +- .../angular/webpack/webpack.custom.js.ejs | 2 +- .../client/templates/common/.eslintignore.ejs | 2 +- .../src/main/webapp/content/scss/rtl.scss.ejs | 2 +- .../client/templates/react/.eslintrc.json.ejs | 2 +- .../client/templates/react/package.json.ejs | 24 +++++++------- .../templates/react/postcss.config.js.ejs | 2 +- .../react/src/main/webapp/404.html.ejs | 2 +- .../webapp/app/_bootstrap-variables.scss.ejs | 2 +- .../react/src/main/webapp/app/app.scss.ejs | 2 +- .../react/src/main/webapp/app/app.tsx.ejs | 2 +- .../app/config/axios-interceptor.ts.ejs | 2 +- .../main/webapp/app/config/constants.ts.ejs | 2 +- .../main/webapp/app/config/devtools.tsx.ejs | 2 +- .../webapp/app/config/error-middleware.ts.ejs | 2 +- .../main/webapp/app/config/icon-loader.ts.ejs | 2 +- .../app/config/logger-middleware.ts.ejs | 2 +- .../app/config/notification-middleware.ts.ejs | 2 +- .../src/main/webapp/app/config/store.ts.ejs | 2 +- .../main/webapp/app/config/translation.ts.ejs | 2 +- .../app/config/websocket-middleware.ts.ejs | 2 +- .../main/webapp/app/entities/index.tsx.ejs | 2 +- .../react/src/main/webapp/app/index.tsx.ejs | 2 +- .../account/activate/activate.reducer.ts.ejs | 2 +- .../modules/account/activate/activate.tsx.ejs | 2 +- .../webapp/app/modules/account/index.tsx.ejs | 2 +- .../finish/password-reset-finish.tsx.ejs | 2 +- .../init/password-reset-init.tsx.ejs | 2 +- .../password-reset.reducer.ts.ejs | 2 +- .../account/password/password.reducer.ts.ejs | 2 +- .../modules/account/password/password.tsx.ejs | 2 +- .../account/register/register.reducer.ts.ejs | 2 +- .../modules/account/register/register.tsx.ejs | 2 +- .../account/sessions/sessions.reducer.ts.ejs | 2 +- .../modules/account/sessions/sessions.tsx.ejs | 2 +- .../account/settings/settings.reducer.ts.ejs | 2 +- .../modules/account/settings/settings.tsx.ejs | 2 +- .../administration.reducer.ts.ejs | 2 +- .../configuration/configuration.tsx.ejs | 2 +- .../modules/administration/docs/docs.scss.ejs | 2 +- .../modules/administration/docs/docs.tsx.ejs | 2 +- .../administration/gateway/gateway.tsx.ejs | 2 +- .../health/health-modal.tsx.ejs | 2 +- .../administration/health/health.tsx.ejs | 2 +- .../app/modules/administration/index.tsx.ejs | 2 +- .../modules/administration/logs/logs.tsx.ejs | 2 +- .../administration/metrics/metrics.tsx.ejs | 2 +- .../administration/tracker/tracker.tsx.ejs | 2 +- .../user-management/index.tsx.ejs | 2 +- .../user-management-delete-dialog.tsx.ejs | 2 +- .../user-management-detail.tsx.ejs | 2 +- .../user-management-update.tsx.ejs | 2 +- .../user-management.reducer.ts.ejs | 2 +- .../user-management/user-management.tsx.ejs | 2 +- .../webapp/app/modules/home/home.scss.ejs | 2 +- .../main/webapp/app/modules/home/home.tsx.ejs | 2 +- .../app/modules/login/login-modal.tsx.ejs | 2 +- .../webapp/app/modules/login/login.tsx.ejs | 2 +- .../webapp/app/modules/login/logout.tsx.ejs | 2 +- .../react/src/main/webapp/app/routes.tsx.ejs | 2 +- .../app/shared/layout/footer/footer.scss.ejs | 2 +- .../app/shared/layout/footer/footer.tsx.ejs | 2 +- .../layout/header/header-components.tsx.ejs | 2 +- .../app/shared/layout/header/header.scss.ejs | 2 +- .../app/shared/layout/header/header.tsx.ejs | 2 +- .../app/shared/layout/menus/account.tsx.ejs | 2 +- .../app/shared/layout/menus/admin.tsx.ejs | 2 +- .../app/shared/layout/menus/entities.tsx.ejs | 2 +- .../app/shared/layout/menus/index.ts.ejs | 2 +- .../app/shared/layout/menus/locale.tsx.ejs | 2 +- .../layout/menus/menu-components.tsx.ejs | 2 +- .../app/shared/layout/menus/menu-item.tsx.ejs | 2 +- .../password/password-strength-bar.scss.ejs | 2 +- .../password/password-strength-bar.tsx.ejs | 2 +- .../webapp/app/shared/model/user.model.ts.ejs | 2 +- .../shared/reducers/action-type.util.ts.ejs | 2 +- .../reducers/application-profile.ts.ejs | 2 +- .../app/shared/reducers/authentication.ts.ejs | 2 +- .../webapp/app/shared/reducers/index.ts.ejs | 2 +- .../webapp/app/shared/reducers/locale.ts.ejs | 2 +- .../shared/reducers/user-management.ts.ejs | 2 +- .../app/shared/util/cookie-utils.ts.ejs | 2 +- .../webapp/app/shared/util/date-utils.ts.ejs | 2 +- .../app/shared/util/entity-utils.ts.ejs | 2 +- .../shared/util/pagination.constants.ts.ejs | 2 +- .../webapp/app/shared/util/url-utils.ts.ejs | 2 +- .../src/main/webapp/app/typings.d.ts.ejs | 2 +- .../react/src/main/webapp/index.html.ejs | 2 +- .../react/src/main/webapp/robots.txt.ejs | 2 +- .../src/main/webapp/swagger-ui/index.html.ejs | 2 +- .../e2e/modules/account/account.spec.ts.ejs | 24 +++++++------- .../administration/administration.spec.ts.ejs | 2 +- .../test/javascript/protractor.conf.js.ejs | 2 +- .../app/config/axios-interceptor.spec.ts.ejs | 2 +- .../notification-middleware.spec.ts.ejs | 2 +- .../activate/activate.reducer.spec.ts.ejs | 2 +- .../password/password.reducer.spec.ts.ejs | 2 +- .../register/register.reducer.spec.ts.ejs | 2 +- .../account/register/register.spec.tsx.ejs | 2 +- .../settings/settings.reducer.spec.ts.ejs | 2 +- .../administration.reducer.spec.ts.ejs | 2 +- .../user-management.reducer.spec.ts.ejs | 2 +- .../shared/layout/header/header.spec.tsx.ejs | 2 +- .../shared/layout/menus/account.spec.tsx.ejs | 2 +- .../reducers/application-profile.spec.ts.ejs | 2 +- .../reducers/authentication.spec.ts.ejs | 2 +- .../reducers/user-management.spec.ts.ejs | 2 +- .../app/shared/util/entity-utils.spec.ts.ejs | 2 +- .../src/test/javascript/spec/app/utils.ts.ejs | 2 +- .../templates/react/tsconfig.e2e.json.ejs | 2 +- .../client/templates/react/tsconfig.json.ejs | 2 +- .../templates/react/tsconfig.test.json.ejs | 2 +- .../templates/react/webpack/utils.js.ejs | 4 +-- .../react/webpack/webpack.common.js.ejs | 2 +- .../react/webpack/webpack.dev.js.ejs | 2 +- .../react/webpack/webpack.prod.js.ejs | 2 +- .../client/templates/vue/.eslintrc.js.ejs | 2 +- .../client/templates/vue/package.json.ejs | 24 +++++++------- .../vue/src/main/webapp/404.html.ejs | 2 +- .../shared/config/axios-interceptor.ts.ejs | 2 +- .../app/shared/data/data-utils.service.ts.ejs | 32 +++++++++++-------- .../main/webapp/content/css/global.css.ejs | 25 ++++++++------- .../src/main/webapp/content/css/rtl.css.ejs | 2 +- .../main/webapp/content/css/vendor.css.ejs | 2 +- .../main/webapp/content/scss/global.scss.ejs | 25 ++++++++------- .../main/webapp/content/scss/vendor.scss.ejs | 2 +- .../vue/src/main/webapp/robots.txt.ejs | 2 +- .../src/main/webapp/swagger-ui/index.html.ejs | 2 +- .../client/templates/vue/webpack/utils.js.ejs | 4 +-- generators/cloudfoundry/index.js | 2 +- generators/cloudfoundry/prompts.js | 2 +- .../application-cloudfoundry.yml.ejs | 2 +- .../cloudfoundry/templates/manifest.yml.ejs | 2 +- generators/common/files.js | 2 +- generators/common/index.js | 2 +- generators/common/templates/.huskyrc.ejs | 2 +- .../common/templates/.lintstagedrc.js.ejs | 2 +- generators/common/templates/README.md.ejs | 2 +- generators/cypress/files.js | 2 +- generators/cypress/index.js | 2 +- .../database-changelog-liquibase/files.js | 2 +- .../database-changelog-liquibase/index.js | 2 +- .../liquibase/changelog/added_entity.xml.ejs | 2 +- .../added_entity_constraints.xml.ejs | 2 +- .../changelog/updated_entity.xml.ejs | 2 +- .../updated_entity_constraints.xml.ejs | 2 +- .../changelog/updated_entity_migrate.xml.ejs | 2 +- .../liquibase/fake-data/table_entity.csv.ejs | 2 +- generators/database-changelog/index.js | 2 +- generators/docker-base.js | 2 +- generators/docker-cli.js | 2 +- generators/docker-compose/files.js | 2 +- generators/docker-compose/index.js | 2 +- .../alertmanager-conf/config.yml.ejs | 2 +- .../central-server-config/application.yml.ejs | 2 +- .../templates/docker-compose.yml.ejs | 2 +- .../templates/log-data/.gitignore.ejs | 2 +- .../prometheus-conf/alert_rules.yml.ejs | 2 +- .../prometheus-conf/prometheus.yml.ejs | 2 +- .../templates/traefik/traefik.toml.ejs | 2 +- generators/docker-prompts.js | 2 +- generators/docker-utils.js | 2 +- generators/entities-client/index.js | 2 +- generators/entities/index.js | 2 +- generators/entity-client/files.js | 2 +- generators/entity-client/index.js | 2 +- ...anagement-delete-dialog.component.html.ejs | 2 +- ...gement-delete-dialog.component.spec.ts.ejs | 2 +- ...-management-delete-dialog.component.ts.ejs | 2 +- ...ntity-management-detail.component.html.ejs | 2 +- ...ty-management-detail.component.spec.ts.ejs | 2 +- .../entity-management-detail.component.ts.ejs | 2 +- ...-management-routing-resolve.service.ts.ejs | 2 +- .../entity-management-routing.module.ts.ejs | 2 +- .../entities/entity-management.module.ts.ejs | 2 +- .../entity-management.service.spec.ts.ejs | 2 +- .../webapp/app/entities/entity.model.ts.ejs | 2 +- .../webapp/app/entities/entity.service.ts.ejs | 2 +- .../list/entity-management.component.html.ejs | 2 +- .../entity-management.component.spec.ts.ejs | 2 +- .../list/entity-management.component.ts.ejs | 2 +- .../list/infinite-scroll-template.ejs | 2 +- .../entities/list/no-pagination-template.ejs | 2 +- .../app/entities/list/pagination-template.ejs | 2 +- ...ntity-management-update.component.html.ejs | 2 +- ...ty-management-update.component.spec.ts.ejs | 2 +- .../entity-management-update.component.ts.ejs | 2 +- .../e2e/entities/entity-page-object.ts.ejs | 2 +- .../e2e/entities/entity.spec.ts.ejs | 2 +- .../entities/enumerations/enum.model.ts.ejs | 2 +- .../app/entities/entity-delete-dialog.tsx.ejs | 2 +- .../webapp/app/entities/entity-detail.tsx.ejs | 2 +- .../webapp/app/entities/entity-update.tsx.ejs | 2 +- .../webapp/app/entities/entity.model.ts.ejs | 2 +- .../webapp/app/entities/entity.reducer.ts.ejs | 2 +- .../main/webapp/app/entities/entity.tsx.ejs | 2 +- .../main/webapp/app/entities/index.tsx.ejs | 2 +- .../webapp/app/entities/react_validators.ejs | 2 +- .../e2e/entities/entity-page-object.ts.ejs | 2 +- .../entities/entity-update-page-object.ts.ejs | 2 +- .../e2e/entities/entity.spec.ts.ejs | 2 +- .../entity-management-detail.spec.ts.ejs | 2 +- .../app/entities/entity-reducer.spec.ts.ejs | 2 +- .../webapp/app/entities/entity.model.ts.ejs | 2 +- .../entity-details-page-object.ts.ejs | 2 +- .../e2e/entities/entity-page-object.ts.ejs | 2 +- .../entities/entity-update-page-object.ts.ejs | 2 +- .../e2e/entities/entity.spec.ts.ejs | 2 +- .../entity-details.component.spec.ts.ejs | 2 +- .../entity-update.component.spec.ts.ejs | 2 +- .../app/entities/entity.component.spec.ts.ejs | 2 +- .../app/entities/entity.service.spec.ts.ejs | 2 +- generators/entity-i18n/files.js | 2 +- generators/entity-i18n/index.js | 2 +- .../templates/i18n/entity_al.json.ejs | 2 +- .../templates/i18n/entity_ar-ly.json.ejs | 2 +- .../templates/i18n/entity_bg.json.ejs | 2 +- .../templates/i18n/entity_bn.json.ejs | 2 +- .../templates/i18n/entity_by.json.ejs | 2 +- .../templates/i18n/entity_ca.json.ejs | 2 +- .../templates/i18n/entity_cs.json.ejs | 2 +- .../templates/i18n/entity_da.json.ejs | 2 +- .../templates/i18n/entity_de.json.ejs | 2 +- .../templates/i18n/entity_el.json.ejs | 2 +- .../templates/i18n/entity_en.json.ejs | 2 +- .../templates/i18n/entity_es.json.ejs | 2 +- .../templates/i18n/entity_et.json.ejs | 2 +- .../templates/i18n/entity_fa.json.ejs | 2 +- .../templates/i18n/entity_fi.json.ejs | 2 +- .../templates/i18n/entity_fr.json.ejs | 2 +- .../templates/i18n/entity_gl.json.ejs | 2 +- .../templates/i18n/entity_hi.json.ejs | 2 +- .../templates/i18n/entity_hr.json.ejs | 2 +- .../templates/i18n/entity_hu.json.ejs | 2 +- .../templates/i18n/entity_hy.json.ejs | 2 +- .../templates/i18n/entity_in.json.ejs | 2 +- .../templates/i18n/entity_it.json.ejs | 2 +- .../templates/i18n/entity_ja.json.ejs | 2 +- .../templates/i18n/entity_ko.json.ejs | 2 +- .../templates/i18n/entity_mr.json.ejs | 2 +- .../templates/i18n/entity_my.json.ejs | 2 +- .../templates/i18n/entity_nl.json.ejs | 2 +- .../templates/i18n/entity_pl.json.ejs | 2 +- .../templates/i18n/entity_pt-br.json.ejs | 2 +- .../templates/i18n/entity_pt-pt.json.ejs | 2 +- .../templates/i18n/entity_ro.json.ejs | 2 +- .../templates/i18n/entity_ru.json.ejs | 2 +- .../templates/i18n/entity_si.json.ejs | 2 +- .../templates/i18n/entity_sk.json.ejs | 2 +- .../templates/i18n/entity_sr.json.ejs | 2 +- .../templates/i18n/entity_sv.json.ejs | 2 +- .../templates/i18n/entity_ta.json.ejs | 2 +- .../templates/i18n/entity_te.json.ejs | 2 +- .../templates/i18n/entity_th.json.ejs | 2 +- .../templates/i18n/entity_tr.json.ejs | 2 +- .../templates/i18n/entity_ua.json.ejs | 2 +- .../templates/i18n/entity_uz-Cyrl-uz.json.ejs | 2 +- .../templates/i18n/entity_uz-Latn-uz.json.ejs | 2 +- .../templates/i18n/entity_vi.json.ejs | 2 +- .../templates/i18n/entity_zh-cn.json.ejs | 2 +- .../templates/i18n/entity_zh-tw.json.ejs | 2 +- .../entity-i18n/templates/i18n/enum.json.ejs | 2 +- generators/entity-server/files.js | 2 +- generators/entity-server/index.js | 2 +- .../partials/it_patch_update.partial.java.ejs | 2 +- .../java/package/common/delete_template.ejs | 2 +- .../java/package/common/field_validators.ejs | 2 +- .../common/get_all_stream_template.ejs | 2 +- .../java/package/common/get_all_template.ejs | 2 +- .../package/common/get_filtered_template.ejs | 2 +- .../main/java/package/common/get_template.ejs | 2 +- .../java/package/common/inject_template.ejs | 2 +- .../java/package/common/patch_template.ejs | 2 +- .../java/package/common/save_template.ejs | 2 +- .../package/common/save_template_reactive.ejs | 2 +- .../package/common/search_stream_template.ejs | 2 +- .../java/package/common/search_template.ejs | 2 +- .../main/java/package/domain/Entity.java.ejs | 2 +- .../package/domain/enumeration/Enum.java.ejs | 2 +- .../domain/relationship_validators.ejs | 2 +- .../repository/EntityRepository.java.ejs | 2 +- ...tyRepositoryInternalImpl_reactive.java.ejs | 2 +- .../EntityRepository_reactive.java.ejs | 2 +- .../rowmapper/EntityRowMapper.java.ejs | 2 +- .../search/EntitySearchRepository.java.ejs | 2 +- .../service/EntityQueryService.java.ejs | 4 +-- .../package/service/EntityService.java.ejs | 2 +- .../package/service/dto/EntityDTO.java.ejs | 2 +- .../service/impl/EntityServiceImpl.java.ejs | 2 +- .../service/mapper/BaseEntityMapper.java.ejs | 2 +- .../service/mapper/EntityMapper.java.ejs | 2 +- .../package/web/rest/EntityResource.java.ejs | 2 +- .../config/cql/changelog/added_entity.cql.ejs | 2 +- .../simulations/EntityGatlingTest.scala.ejs | 2 +- .../java/package/domain/EntityTest.java.ejs | 2 +- ...SearchRepositoryMockConfiguration.java.ejs | 2 +- .../service/dto/EntityDTOTest.java.ejs | 2 +- .../service/mapper/EntityMapperTest.java.ejs | 2 +- .../web/rest/EntityResourceIT.java.ejs | 2 +- generators/entity/index.js | 2 +- generators/entity/prompts.js | 2 +- generators/export-jdl/index.js | 2 +- generators/gae/index.js | 2 +- generators/gae/templates/app.yaml.ejs | 2 +- .../templates/application-prod-gae.yml.ejs | 2 +- generators/gae/templates/dispatch.yaml.ejs | 2 +- generators/gae/templates/gae.gradle.ejs | 2 +- .../templates/pom-gae-build-profile.xml.ejs | 2 +- generators/gae/templates/pom-plugin.xml.ejs | 2 +- generators/gae/templates/pom-profile.xml.ejs | 2 +- generators/generator-base-blueprint.js | 2 +- generators/generator-base-docker.js | 2 +- generators/generator-base-private.js | 2 +- generators/generator-base.js | 2 +- generators/generator-constants.js | 2 +- generators/generator-defaults.js | 2 +- generators/generator-transforms.js | 2 +- generators/heroku/index.js | 2 +- generators/heroku/templates/Procfile.ejs | 2 +- .../templates/application-heroku.yml.ejs | 2 +- .../heroku/templates/bootstrap-heroku.yml.ejs | 2 +- generators/heroku/templates/heroku.gradle.ejs | 2 +- generators/info/index.js | 2 +- generators/kubernetes-base.js | 2 +- generators/kubernetes-helm/files.js | 2 +- generators/kubernetes-helm/index.js | 2 +- .../templates/helm-apply.sh.ejs | 2 +- .../templates/helm-upgrade.sh.ejs | 2 +- generators/kubernetes-knative/files.js | 2 +- generators/kubernetes-knative/index.js | 2 +- generators/kubernetes-knative/prompts.js | 2 +- .../templates/helm-apply.sh.ejs | 4 +-- .../templates/helm-upgrade.sh.ejs | 4 +-- .../templates/istio/gateway.yml.ejs | 2 +- .../templates/kubectl-apply.sh.ejs | 2 +- .../templates/service.yml.ejs | 2 +- generators/kubernetes/files.js | 2 +- generators/kubernetes/index.js | 2 +- generators/kubernetes/prompts.js | 2 +- .../kubernetes/templates/db/couchbase.yml.ejs | 2 +- .../templates/db/elasticsearch.yml.ejs | 2 +- .../kubernetes/templates/db/mariadb.yml.ejs | 2 +- .../kubernetes/templates/db/mongodb.yml.ejs | 2 +- .../kubernetes/templates/db/mssql.yml.ejs | 2 +- .../kubernetes/templates/db/mysql.yml.ejs | 2 +- .../templates/db/postgresql.yml.ejs | 2 +- .../kubernetes/templates/deployment.yml.ejs | 2 +- .../kubernetes/templates/ingress.yml.ejs | 2 +- .../templates/istio/gateway.yml.ejs | 2 +- .../istio/gateway/grafana-gateway.yml.ejs | 4 +-- .../gateway/jhipster-grafana-gateway.yml.ejs | 2 +- .../istio/gateway/kiali-gateway.yml.ejs | 4 +-- .../istio/gateway/zipkin-gateway.yml.ejs | 4 +-- .../kubernetes/templates/kubectl-apply.sh.ejs | 2 +- .../templates/messagebroker/kafka.yml.ejs | 2 +- .../jhipster-grafana-dashboard.yml.ejs | 2 +- .../monitoring/jhipster-grafana.yml.ejs | 2 +- .../monitoring/jhipster-prometheus-cr.yml.ejs | 2 +- .../jhipster-prometheus-crd.yml.ejs | 2 +- .../monitoring/jhipster-prometheus-sm.yml.ejs | 2 +- .../kubernetes/templates/namespace.yml.ejs | 2 +- .../registry/application-configmap.yml.ejs | 2 +- .../registry/consul-config-loader.yml.ejs | 2 +- .../templates/registry/consul.yml.ejs | 2 +- .../registry/jhipster-registry.yml.ejs | 2 +- .../templates/secret/jwt-secret.yml.ejs | 2 +- .../kubernetes/templates/service.yml.ejs | 2 +- generators/languages/index.js | 2 +- generators/languages/prompts.js | 2 +- .../resources/i18n/messages_al.properties.ejs | 2 +- .../i18n/messages_ar_LY.properties.ejs | 2 +- .../resources/i18n/messages_bg.properties.ejs | 2 +- .../resources/i18n/messages_bn.properties.ejs | 2 +- .../resources/i18n/messages_by.properties.ejs | 2 +- .../resources/i18n/messages_ca.properties.ejs | 2 +- .../resources/i18n/messages_cs.properties.ejs | 2 +- .../resources/i18n/messages_da.properties.ejs | 2 +- .../resources/i18n/messages_de.properties.ejs | 2 +- .../resources/i18n/messages_el.properties.ejs | 2 +- .../resources/i18n/messages_en.properties.ejs | 2 +- .../resources/i18n/messages_es.properties.ejs | 2 +- .../resources/i18n/messages_et.properties.ejs | 2 +- .../resources/i18n/messages_fa.properties.ejs | 2 +- .../resources/i18n/messages_fi.properties.ejs | 2 +- .../resources/i18n/messages_fr.properties.ejs | 2 +- .../resources/i18n/messages_gl.properties.ejs | 2 +- .../resources/i18n/messages_hi.properties.ejs | 2 +- .../resources/i18n/messages_hr.properties.ejs | 2 +- .../resources/i18n/messages_hu.properties.ejs | 2 +- .../resources/i18n/messages_hy.properties.ejs | 2 +- .../resources/i18n/messages_in.properties.ejs | 2 +- .../resources/i18n/messages_it.properties.ejs | 2 +- .../resources/i18n/messages_ja.properties.ejs | 2 +- .../resources/i18n/messages_ko.properties.ejs | 2 +- .../resources/i18n/messages_mr.properties.ejs | 2 +- .../resources/i18n/messages_my.properties.ejs | 2 +- .../resources/i18n/messages_nl.properties.ejs | 2 +- .../resources/i18n/messages_pl.properties.ejs | 2 +- .../i18n/messages_pt_BR.properties.ejs | 2 +- .../i18n/messages_pt_PT.properties.ejs | 2 +- .../resources/i18n/messages_ro.properties.ejs | 2 +- .../resources/i18n/messages_ru.properties.ejs | 2 +- .../resources/i18n/messages_si.properties.ejs | 2 +- .../resources/i18n/messages_sk.properties.ejs | 2 +- .../resources/i18n/messages_sr.properties.ejs | 2 +- .../resources/i18n/messages_sv.properties.ejs | 2 +- .../resources/i18n/messages_ta.properties.ejs | 2 +- .../resources/i18n/messages_te.properties.ejs | 2 +- .../resources/i18n/messages_th.properties.ejs | 2 +- .../resources/i18n/messages_tr.properties.ejs | 2 +- .../resources/i18n/messages_ua.properties.ejs | 2 +- .../i18n/messages_uz_Cyrl_UZ.properties.ejs | 6 +++- .../i18n/messages_uz_Latn_UZ.properties.ejs | 2 +- .../resources/i18n/messages_vi.properties.ejs | 2 +- .../i18n/messages_zh_CN.properties.ejs | 2 +- .../i18n/messages_zh_TW.properties.ejs | 2 +- .../src/main/webapp/i18n/al/activate.json.ejs | 2 +- .../src/main/webapp/i18n/al/global.json.ejs | 2 +- .../src/main/webapp/i18n/al/health.json.ejs | 2 +- .../src/main/webapp/i18n/al/reset.json.ejs | 2 +- .../main/webapp/i18n/ar-ly/activate.json.ejs | 2 +- .../main/webapp/i18n/ar-ly/global.json.ejs | 2 +- .../main/webapp/i18n/ar-ly/health.json.ejs | 2 +- .../src/main/webapp/i18n/ar-ly/reset.json.ejs | 2 +- .../src/main/webapp/i18n/bg/activate.json.ejs | 2 +- .../src/main/webapp/i18n/bg/global.json.ejs | 2 +- .../src/main/webapp/i18n/bg/health.json.ejs | 2 +- .../src/main/webapp/i18n/bg/reset.json.ejs | 2 +- .../src/main/webapp/i18n/bn/activate.json.ejs | 2 +- .../src/main/webapp/i18n/bn/global.json.ejs | 2 +- .../src/main/webapp/i18n/bn/health.json.ejs | 2 +- .../src/main/webapp/i18n/bn/reset.json.ejs | 2 +- .../src/main/webapp/i18n/by/activate.json.ejs | 2 +- .../src/main/webapp/i18n/by/global.json.ejs | 2 +- .../src/main/webapp/i18n/by/health.json.ejs | 2 +- .../src/main/webapp/i18n/by/reset.json.ejs | 2 +- .../src/main/webapp/i18n/ca/activate.json.ejs | 2 +- .../src/main/webapp/i18n/ca/global.json.ejs | 2 +- .../src/main/webapp/i18n/ca/health.json.ejs | 2 +- .../src/main/webapp/i18n/ca/reset.json.ejs | 2 +- .../src/main/webapp/i18n/cs/activate.json.ejs | 2 +- .../src/main/webapp/i18n/cs/global.json.ejs | 2 +- .../src/main/webapp/i18n/cs/health.json.ejs | 2 +- .../src/main/webapp/i18n/cs/reset.json.ejs | 2 +- .../src/main/webapp/i18n/da/activate.json.ejs | 2 +- .../src/main/webapp/i18n/da/global.json.ejs | 2 +- .../src/main/webapp/i18n/da/health.json.ejs | 2 +- .../src/main/webapp/i18n/da/reset.json.ejs | 2 +- .../src/main/webapp/i18n/de/activate.json.ejs | 2 +- .../src/main/webapp/i18n/de/global.json.ejs | 2 +- .../src/main/webapp/i18n/de/health.json.ejs | 2 +- .../src/main/webapp/i18n/de/reset.json.ejs | 2 +- .../src/main/webapp/i18n/el/activate.json.ejs | 2 +- .../src/main/webapp/i18n/el/global.json.ejs | 2 +- .../src/main/webapp/i18n/el/health.json.ejs | 2 +- .../src/main/webapp/i18n/el/reset.json.ejs | 2 +- .../src/main/webapp/i18n/en/activate.json.ejs | 2 +- .../src/main/webapp/i18n/en/global.json.ejs | 2 +- .../src/main/webapp/i18n/en/health.json.ejs | 2 +- .../src/main/webapp/i18n/en/reset.json.ejs | 2 +- .../src/main/webapp/i18n/es/activate.json.ejs | 2 +- .../src/main/webapp/i18n/es/global.json.ejs | 2 +- .../src/main/webapp/i18n/es/health.json.ejs | 2 +- .../src/main/webapp/i18n/es/reset.json.ejs | 2 +- .../src/main/webapp/i18n/et/activate.json.ejs | 2 +- .../src/main/webapp/i18n/et/global.json.ejs | 2 +- .../src/main/webapp/i18n/et/health.json.ejs | 2 +- .../src/main/webapp/i18n/et/reset.json.ejs | 2 +- .../src/main/webapp/i18n/fa/activate.json.ejs | 2 +- .../src/main/webapp/i18n/fa/global.json.ejs | 2 +- .../src/main/webapp/i18n/fa/health.json.ejs | 2 +- .../src/main/webapp/i18n/fa/reset.json.ejs | 2 +- .../src/main/webapp/i18n/fi/activate.json.ejs | 2 +- .../src/main/webapp/i18n/fi/global.json.ejs | 2 +- .../src/main/webapp/i18n/fi/health.json.ejs | 2 +- .../src/main/webapp/i18n/fi/reset.json.ejs | 2 +- .../src/main/webapp/i18n/fr/activate.json.ejs | 2 +- .../src/main/webapp/i18n/fr/global.json.ejs | 2 +- .../src/main/webapp/i18n/fr/health.json.ejs | 2 +- .../src/main/webapp/i18n/fr/reset.json.ejs | 2 +- .../src/main/webapp/i18n/gl/activate.json.ejs | 2 +- .../src/main/webapp/i18n/gl/global.json.ejs | 2 +- .../src/main/webapp/i18n/gl/health.json.ejs | 2 +- .../src/main/webapp/i18n/gl/reset.json.ejs | 2 +- .../src/main/webapp/i18n/hi/activate.json.ejs | 2 +- .../src/main/webapp/i18n/hi/global.json.ejs | 2 +- .../src/main/webapp/i18n/hi/health.json.ejs | 2 +- .../src/main/webapp/i18n/hi/reset.json.ejs | 2 +- .../src/main/webapp/i18n/hr/activate.json.ejs | 2 +- .../src/main/webapp/i18n/hr/global.json.ejs | 2 +- .../src/main/webapp/i18n/hr/health.json.ejs | 2 +- .../src/main/webapp/i18n/hr/reset.json.ejs | 2 +- .../src/main/webapp/i18n/hu/activate.json.ejs | 2 +- .../src/main/webapp/i18n/hu/global.json.ejs | 2 +- .../src/main/webapp/i18n/hu/health.json.ejs | 2 +- .../src/main/webapp/i18n/hu/reset.json.ejs | 2 +- .../src/main/webapp/i18n/hy/activate.json.ejs | 2 +- .../src/main/webapp/i18n/hy/global.json.ejs | 2 +- .../src/main/webapp/i18n/hy/health.json.ejs | 2 +- .../src/main/webapp/i18n/hy/reset.json.ejs | 2 +- .../src/main/webapp/i18n/in/activate.json.ejs | 2 +- .../src/main/webapp/i18n/in/global.json.ejs | 2 +- .../src/main/webapp/i18n/in/health.json.ejs | 2 +- .../src/main/webapp/i18n/in/reset.json.ejs | 2 +- .../src/main/webapp/i18n/it/activate.json.ejs | 2 +- .../src/main/webapp/i18n/it/global.json.ejs | 2 +- .../src/main/webapp/i18n/it/health.json.ejs | 2 +- .../src/main/webapp/i18n/it/reset.json.ejs | 2 +- .../src/main/webapp/i18n/ja/activate.json.ejs | 2 +- .../src/main/webapp/i18n/ja/global.json.ejs | 2 +- .../src/main/webapp/i18n/ja/health.json.ejs | 2 +- .../src/main/webapp/i18n/ja/reset.json.ejs | 2 +- .../src/main/webapp/i18n/ko/activate.json.ejs | 2 +- .../src/main/webapp/i18n/ko/global.json.ejs | 2 +- .../src/main/webapp/i18n/ko/health.json.ejs | 2 +- .../src/main/webapp/i18n/ko/reset.json.ejs | 2 +- .../src/main/webapp/i18n/mr/activate.json.ejs | 2 +- .../src/main/webapp/i18n/mr/global.json.ejs | 2 +- .../src/main/webapp/i18n/mr/health.json.ejs | 2 +- .../src/main/webapp/i18n/mr/reset.json.ejs | 2 +- .../src/main/webapp/i18n/my/activate.json.ejs | 2 +- .../src/main/webapp/i18n/my/global.json.ejs | 2 +- .../src/main/webapp/i18n/my/health.json.ejs | 2 +- .../src/main/webapp/i18n/my/reset.json.ejs | 2 +- .../src/main/webapp/i18n/nl/activate.json.ejs | 2 +- .../src/main/webapp/i18n/nl/global.json.ejs | 2 +- .../src/main/webapp/i18n/nl/health.json.ejs | 2 +- .../src/main/webapp/i18n/nl/reset.json.ejs | 2 +- .../src/main/webapp/i18n/pl/activate.json.ejs | 2 +- .../src/main/webapp/i18n/pl/global.json.ejs | 2 +- .../src/main/webapp/i18n/pl/health.json.ejs | 2 +- .../src/main/webapp/i18n/pl/reset.json.ejs | 2 +- .../main/webapp/i18n/pt-br/activate.json.ejs | 2 +- .../main/webapp/i18n/pt-br/global.json.ejs | 2 +- .../main/webapp/i18n/pt-br/health.json.ejs | 2 +- .../src/main/webapp/i18n/pt-br/reset.json.ejs | 2 +- .../main/webapp/i18n/pt-pt/activate.json.ejs | 2 +- .../main/webapp/i18n/pt-pt/global.json.ejs | 2 +- .../main/webapp/i18n/pt-pt/health.json.ejs | 2 +- .../src/main/webapp/i18n/pt-pt/reset.json.ejs | 2 +- .../src/main/webapp/i18n/ro/activate.json.ejs | 2 +- .../src/main/webapp/i18n/ro/global.json.ejs | 2 +- .../src/main/webapp/i18n/ro/health.json.ejs | 2 +- .../src/main/webapp/i18n/ro/reset.json.ejs | 2 +- .../src/main/webapp/i18n/ru/activate.json.ejs | 2 +- .../src/main/webapp/i18n/ru/global.json.ejs | 2 +- .../src/main/webapp/i18n/ru/health.json.ejs | 2 +- .../src/main/webapp/i18n/ru/reset.json.ejs | 2 +- .../src/main/webapp/i18n/si/activate.json.ejs | 2 +- .../src/main/webapp/i18n/si/global.json.ejs | 2 +- .../src/main/webapp/i18n/si/health.json.ejs | 2 +- .../src/main/webapp/i18n/si/reset.json.ejs | 2 +- .../src/main/webapp/i18n/sk/activate.json.ejs | 2 +- .../src/main/webapp/i18n/sk/global.json.ejs | 2 +- .../src/main/webapp/i18n/sk/health.json.ejs | 2 +- .../src/main/webapp/i18n/sk/reset.json.ejs | 2 +- .../src/main/webapp/i18n/sr/activate.json.ejs | 2 +- .../src/main/webapp/i18n/sr/global.json.ejs | 2 +- .../src/main/webapp/i18n/sr/health.json.ejs | 2 +- .../src/main/webapp/i18n/sr/reset.json.ejs | 2 +- .../src/main/webapp/i18n/sv/activate.json.ejs | 2 +- .../src/main/webapp/i18n/sv/global.json.ejs | 2 +- .../src/main/webapp/i18n/sv/health.json.ejs | 2 +- .../src/main/webapp/i18n/sv/reset.json.ejs | 2 +- .../src/main/webapp/i18n/ta/activate.json.ejs | 2 +- .../src/main/webapp/i18n/ta/global.json.ejs | 2 +- .../src/main/webapp/i18n/ta/health.json.ejs | 2 +- .../src/main/webapp/i18n/ta/reset.json.ejs | 2 +- .../src/main/webapp/i18n/te/activate.json.ejs | 2 +- .../src/main/webapp/i18n/te/global.json.ejs | 2 +- .../src/main/webapp/i18n/te/health.json.ejs | 2 +- .../src/main/webapp/i18n/te/reset.json.ejs | 2 +- .../src/main/webapp/i18n/th/activate.json.ejs | 2 +- .../src/main/webapp/i18n/th/global.json.ejs | 2 +- .../src/main/webapp/i18n/th/health.json.ejs | 2 +- .../src/main/webapp/i18n/th/reset.json.ejs | 2 +- .../src/main/webapp/i18n/tr/activate.json.ejs | 2 +- .../src/main/webapp/i18n/tr/global.json.ejs | 2 +- .../src/main/webapp/i18n/tr/health.json.ejs | 2 +- .../src/main/webapp/i18n/tr/reset.json.ejs | 2 +- .../src/main/webapp/i18n/ua/activate.json.ejs | 2 +- .../src/main/webapp/i18n/ua/global.json.ejs | 2 +- .../src/main/webapp/i18n/ua/health.json.ejs | 2 +- .../src/main/webapp/i18n/ua/reset.json.ejs | 2 +- .../webapp/i18n/uz-Cyrl-uz/activate.json.ejs | 2 +- .../webapp/i18n/uz-Cyrl-uz/global.json.ejs | 8 +++-- .../webapp/i18n/uz-Cyrl-uz/health.json.ejs | 6 +++- .../webapp/i18n/uz-Cyrl-uz/reset.json.ejs | 8 +++-- .../webapp/i18n/uz-Latn-uz/activate.json.ejs | 2 +- .../webapp/i18n/uz-Latn-uz/global.json.ejs | 2 +- .../webapp/i18n/uz-Latn-uz/health.json.ejs | 2 +- .../webapp/i18n/uz-Latn-uz/reset.json.ejs | 2 +- .../src/main/webapp/i18n/vi/activate.json.ejs | 2 +- .../src/main/webapp/i18n/vi/global.json.ejs | 2 +- .../src/main/webapp/i18n/vi/health.json.ejs | 2 +- .../src/main/webapp/i18n/vi/reset.json.ejs | 2 +- .../main/webapp/i18n/zh-cn/activate.json.ejs | 2 +- .../main/webapp/i18n/zh-cn/global.json.ejs | 2 +- .../main/webapp/i18n/zh-cn/health.json.ejs | 2 +- .../src/main/webapp/i18n/zh-cn/reset.json.ejs | 2 +- .../main/webapp/i18n/zh-tw/activate.json.ejs | 2 +- .../main/webapp/i18n/zh-tw/global.json.ejs | 2 +- .../main/webapp/i18n/zh-tw/health.json.ejs | 2 +- .../src/main/webapp/i18n/zh-tw/reset.json.ejs | 2 +- generators/needle-api.js | 2 +- generators/needle-base.js | 2 +- generators/openapi-client/files.js | 2 +- generators/openapi-client/index.js | 2 +- generators/openapi-client/prompts.js | 2 +- generators/openshift/files.js | 2 +- generators/openshift/index.js | 2 +- generators/openshift/prompts.js | 2 +- generators/openshift/templates/apply.sh.ejs | 2 +- .../openshift/templates/db/cassandra.yml.ejs | 2 +- .../openshift/templates/db/couchbase.yml.ejs | 2 +- .../templates/db/elasticsearch.yml.ejs | 2 +- .../openshift/templates/db/mariadb.yml.ejs | 2 +- .../openshift/templates/db/mongodb.yml.ejs | 2 +- .../openshift/templates/db/mysql.yml.ejs | 2 +- .../openshift/templates/db/postgresql.yml.ejs | 2 +- .../openshift/templates/deployment.yml.ejs | 2 +- .../templates/messagebroker/kafka.yml.ejs | 2 +- .../monitoring/jhipster-metrics.yml.ejs | 2 +- .../registry/application-configmap.yml.ejs | 2 +- .../templates/registry/consul.yml.ejs | 2 +- .../registry/jhipster-registry.yml.ejs | 2 +- .../templates/scc/scc-config.yml.ejs | 2 +- generators/page/files-vue.js | 2 +- generators/page/index.js | 2 +- generators/page/prompts.js | 2 +- .../e2e/pages/page.page-object.ts.ejs | 2 +- .../javascript/e2e/pages/page.spec.ts.ejs | 2 +- .../spec/app/pages/page.component.spec.ts.ejs | 2 +- .../spec/app/pages/page.service.spec.ts.ejs | 2 +- generators/server/files.js | 2 +- generators/server/index.js | 2 +- .../server/needle-api/needle-server-cache.js | 2 +- .../server/needle-api/needle-server-gradle.js | 2 +- .../needle-api/needle-server-liquibase.js | 2 +- .../needle-server-logback-spring.js | 2 +- .../server/needle-api/needle-server-maven.js | 2 +- generators/server/needle-api/needle-server.js | 2 +- generators/server/prompts.js | 2 +- generators/server/templates/build.gradle.ejs | 2 +- .../server/templates/checkstyle.xml.ejs | 2 +- .../server/templates/gradle.properties.ejs | 2 +- .../server/templates/gradle/docker.gradle.ejs | 2 +- .../templates/gradle/profile_dev.gradle.ejs | 2 +- .../templates/gradle/profile_prod.gradle.ejs | 2 +- .../server/templates/gradle/sonar.gradle.ejs | 2 +- .../templates/gradle/swagger.gradle.ejs | 2 +- .../server/templates/gradle/war.gradle.ejs | 2 +- .../server/templates/gradle/zipkin.gradle.ejs | 2 +- generators/server/templates/package.json.ejs | 2 +- generators/server/templates/pom.xml.ejs | 2 +- .../server/templates/settings.gradle.ejs | 2 +- .../templates/src/main/docker/app.yml.ejs | 2 +- .../src/main/docker/cassandra-cluster.yml.ejs | 2 +- .../main/docker/cassandra-migration.yml.ejs | 2 +- .../src/main/docker/cassandra.yml.ejs | 2 +- .../Cassandra-Migration.Dockerfile.ejs | 2 +- .../cassandra/scripts/autoMigrate.sh.ejs | 2 +- .../cassandra/scripts/execute-cql.sh.ejs | 2 +- .../src/main/docker/config/README.md.ejs | 2 +- .../templates/src/main/docker/consul.yml.ejs | 2 +- .../src/main/docker/couchbase-cluster.yml.ejs | 2 +- .../src/main/docker/couchbase.yml.ejs | 2 +- .../src/main/docker/elasticsearch.yml.ejs | 2 +- .../provisioning/dashboards/JVM.json.ejs | 2 +- .../provisioning/dashboards/dashboard.yml.ejs | 2 +- .../datasources/datasource.yml.ejs | 2 +- .../hazelcast-management-center.yml.ejs | 2 +- .../docker/jhipster-control-center.yml.ejs | 24 +++++++------- .../src/main/docker/jhipster-registry.yml.ejs | 2 +- .../templates/src/main/docker/kafka.yml.ejs | 2 +- .../src/main/docker/keycloak.yml.ejs | 2 +- .../templates/src/main/docker/mariadb.yml.ejs | 2 +- .../src/main/docker/memcached.yml.ejs | 2 +- .../src/main/docker/mongodb-cluster.yml.ejs | 2 +- .../templates/src/main/docker/mongodb.yml.ejs | 2 +- .../src/main/docker/monitoring.yml.ejs | 2 +- .../templates/src/main/docker/mssql.yml.ejs | 2 +- .../templates/src/main/docker/mysql.yml.ejs | 2 +- .../templates/src/main/docker/neo4j.yml.ejs | 2 +- .../src/main/docker/postgresql.yml.ejs | 2 +- .../main/docker/prometheus/prometheus.yml.ejs | 2 +- .../src/main/docker/redis-cluster.yml.ejs | 6 +++- .../templates/src/main/docker/redis.yml.ejs | 6 +++- .../templates/src/main/docker/sonar.yml.ejs | 2 +- .../src/main/docker/swagger-editor.yml.ejs | 2 +- .../main/java/package/Application.java.ejs | 2 +- .../java/package/ApplicationWebXml.java.ejs | 2 +- .../java/package/GeneratedByJHipster.java.ejs | 2 +- .../aop/logging/LoggingAspect.java.ejs | 2 +- .../client/AuthorizedFeignClient.java.ejs | 2 +- .../client/AuthorizedUserFeignClient.java.ejs | 4 +-- .../JWT_UserFeignClientInterceptor.java.ejs | 4 +-- ...uth2InterceptedFeignConfiguration.java.ejs | 2 +- ...Auth2UserClientFeignConfiguration.java.ejs | 4 +-- ...OAuth2_UserFeignClientInterceptor.java.ejs | 4 +-- .../TokenRelayRequestInterceptor.java.ejs | 2 +- .../config/ApplicationProperties.java.ejs | 2 +- .../config/AsyncConfiguration.java.ejs | 2 +- .../config/CacheConfiguration.java.ejs | 2 +- .../config/CacheFactoryConfiguration.java.ejs | 2 +- .../CloudDatabaseConfiguration.java.ejs | 2 +- .../java/package/config/Constants.java.ejs | 2 +- .../DatabaseConfiguration_cassandra.java.ejs | 2 +- .../DatabaseConfiguration_couchbase.java.ejs | 2 +- .../DatabaseConfiguration_mongodb.java.ejs | 2 +- .../DatabaseConfiguration_neo4j.java.ejs | 2 +- .../config/DatabaseConfiguration_sql.java.ejs | 2 +- .../DateTimeFormatConfiguration.java.ejs | 2 +- .../ElasticsearchConfiguration.java.ejs | 2 +- .../config/FeignConfiguration.java.ejs | 2 +- .../config/GatewayConfiguration.java.ejs | 2 +- .../config/JacksonConfiguration.java.ejs | 2 +- .../package/config/KafkaProperties.java.ejs | 2 +- .../config/LiquibaseConfiguration.java.ejs | 2 +- .../config/LocaleConfiguration.java.ejs | 2 +- .../LoggingAspectConfiguration.java.ejs | 2 +- .../config/LoggingConfiguration.java.ejs | 2 +- .../config/OAuth2SsoConfiguration.java.ejs | 2 +- .../OAuth2TokenServicesConfiguration.java.ejs | 2 +- .../config/OpenApiConfiguration.java.ejs | 24 +++++++------- .../config/SecurityConfiguration.java.ejs | 2 +- .../SecurityConfiguration_reactive.java.ejs | 2 +- .../config/SecurityConfiguration_uaa.java.ejs | 2 +- .../StaticResourcesWebConfiguration.java.ejs | 2 +- .../package/config/UaaConfiguration.java.ejs | 2 +- .../package/config/UaaProperties.java.ejs | 4 +-- .../UaaWebSecurityConfiguration.java.ejs | 2 +- .../package/config/WebConfigurer.java.ejs | 2 +- .../config/WebsocketConfiguration.java.ejs | 2 +- .../WebsocketSecurityConfiguration.java.ejs | 2 +- .../GatewaySwaggerResourcesProvider.java.ejs | 2 +- .../InitialSetupMigration.java.ejs | 2 +- .../config/dbmigrations/package-info.java.ejs | 2 +- .../config/neo4j/Neo4jMigrations.java.ejs | 2 +- .../config/neo4j/package-info.java.ejs | 2 +- ...OAuth2AuthenticationConfiguration.java.ejs | 4 +-- .../OAuth2JwtAccessTokenConverter.java.ejs | 4 +-- .../config/oauth2/OAuth2Properties.java.ejs | 4 +-- .../java/package/config/package-info.java.ejs | 2 +- .../domain/AbstractAuditingEntity.java.ejs | 2 +- .../java/package/domain/Authority.java.ejs | 2 +- .../package/domain/PersistentToken.java.ejs | 2 +- .../main/java/package/domain/User.java.ejs | 2 +- .../java/package/domain/package-info.java.ejs | 2 +- .../package/gateway/TokenRelayFilter.java.ejs | 2 +- .../AccessControlFilter.java.ejs | 2 +- .../ratelimiting/RateLimitingFilter.java.ejs | 2 +- .../SwaggerBasePathRewritingFilter.java.ejs | 2 +- .../repository/AuthorityRepository.java.ejs | 2 +- .../CustomN1qlCouchbaseRepository.java.ejs | 4 +-- ...omReactiveN1qlCouchbaseRepository.java.ejs | 4 +-- .../N1qlCouchbaseRepository.java.ejs | 4 +-- .../PersistentTokenRepository.java.ejs | 2 +- .../ReactiveN1qlCouchbaseRepository.java.ejs | 6 ++-- .../repository/UserRepository.java.ejs | 2 +- .../package/repository/package-info.java.ejs | 2 +- .../rowmapper/UserRowMapper.java.ejs | 2 +- .../search/SearchCouchbaseRepository.java.ejs | 2 +- .../search/UserSearchRepository.java.ejs | 2 +- .../repository/search/package-info.java.ejs | 2 +- .../security/AuthoritiesConstants.java.ejs | 2 +- .../DomainUserDetailsService.java.ejs | 2 +- .../security/IatTokenEnhancer.java.ejs | 4 +-- ...PersistentTokenRememberMeServices.java.ejs | 2 +- .../package/security/SecurityUtils.java.ejs | 2 +- .../SpringSecurityAuditorAware.java.ejs | 2 +- .../UserNotActivatedException.java.ejs | 2 +- .../security/jwt/JWTConfigurer.java.ejs | 2 +- .../package/security/jwt/JWTFilter.java.ejs | 2 +- .../jwt/JWTRelayGatewayFilterFactory.java.ejs | 2 +- .../security/jwt/TokenProvider.java.ejs | 2 +- .../oauth2/AudienceValidator.java.ejs | 4 +-- .../oauth2/AuthorizationHeaderFilter.java.ejs | 24 +++++++------- .../oauth2/AuthorizationHeaderUtil.java.ejs | 4 +-- .../CachedUserInfoTokenServices.java.ejs | 4 +-- .../security/oauth2/CookieCollection.java.ejs | 4 +-- .../oauth2/CookieTokenExtractor.java.ejs | 4 +-- .../CookiesHttpServletRequestWrapper.java.ejs | 4 +-- .../JwtGrantedAuthorityConverter.java.ejs | 4 +-- .../OAuth2AuthenticationService.java.ejs | 4 +-- .../oauth2/OAuth2CookieHelper.java.ejs | 4 +-- .../security/oauth2/OAuth2Cookies.java.ejs | 4 +-- .../OAuth2SignatureVerifierClient.java.ejs | 4 +-- .../oauth2/OAuth2TokenEndpointClient.java.ejs | 4 +-- .../OAuth2TokenEndpointClientAdapter.java.ejs | 4 +-- .../oauth2/OAuthIdpTokenResponseDTO.java.ejs | 4 +-- .../SimpleAuthoritiesExtractor.java.ejs | 2 +- .../oauth2/SimplePrincipalExtractor.java.ejs | 2 +- .../UaaSignatureVerifierClient.java.ejs | 4 +-- .../oauth2/UaaTokenEndpointClient.java.ejs | 4 +-- .../package/security/package-info.java.ejs | 2 +- .../package/service/ColumnConverter.java.ejs | 2 +- .../EmailAlreadyUsedException.java.ejs | 2 +- .../package/service/EntityManager.java.ejs | 2 +- .../service/InvalidPasswordException.java.ejs | 2 +- .../java/package/service/MailService.java.ejs | 2 +- .../java/package/service/UserService.java.ejs | 2 +- .../UsernameAlreadyUsedException.java.ejs | 2 +- .../service/dto/PasswordChangeDTO.java.ejs | 2 +- .../java/package/service/dto/UserDTO.java.ejs | 2 +- .../package/service/dto/package-info.java.ejs | 2 +- .../service/mapper/UserMapper.java.ejs | 2 +- .../service/mapper/package-info.java.ejs | 2 +- .../package/service/package-info.java.ejs | 2 +- .../web/filter/RefreshTokenFilter.java.ejs | 4 +-- .../RefreshTokenFilterConfigurer.java.ejs | 4 +-- .../web/filter/RouteDetectorFilter.java.ejs | 4 +-- .../package/web/filter/SpaWebFilter.java.ejs | 4 +-- .../package/web/rest/AccountResource.java.ejs | 24 +++++++------- .../web/rest/AuthInfoResource.java.ejs | 24 +++++++------- .../package/web/rest/AuthResource.java.ejs | 4 +-- .../web/rest/ClientForwardController.java.ejs | 24 +++++++------- .../package/web/rest/GatewayResource.java.ejs | 2 +- .../package/web/rest/KafkaResource.java.ejs | 2 +- .../package/web/rest/LogoutResource.java.ejs | 4 +-- .../web/rest/UserJWTController.java.ejs | 2 +- .../package/web/rest/UserResource.java.ejs | 2 +- .../errors/BadRequestAlertException.java.ejs | 2 +- .../errors/EmailAlreadyUsedException.java.ejs | 2 +- .../web/rest/errors/ErrorConstants.java.ejs | 2 +- .../rest/errors/ExceptionTranslator.java.ejs | 2 +- .../web/rest/errors/FieldErrorVM.java.ejs | 2 +- .../errors/InvalidPasswordException.java.ejs | 2 +- .../errors/LoginAlreadyUsedException.java.ejs | 2 +- .../web/rest/errors/package-info.java.ejs | 2 +- .../package/web/rest/package-info.java.ejs | 2 +- .../web/rest/vm/KeyAndPasswordVM.java.ejs | 2 +- .../java/package/web/rest/vm/LoginVM.java.ejs | 2 +- .../web/rest/vm/ManagedUserVM.java.ejs | 2 +- .../java/package/web/rest/vm/RouteVM.java.ejs | 2 +- .../package/web/rest/vm/package-info.java.ejs | 2 +- .../web/websocket/ActivityService.java.ejs | 2 +- .../web/websocket/dto/ActivityDTO.java.ejs | 2 +- .../web/websocket/dto/package-info.java.ejs | 2 +- .../web/websocket/package-info.java.ejs | 2 +- .../resources/config/application-dev.yml.ejs | 2 +- .../resources/config/application-prod.yml.ejs | 2 +- .../main/resources/config/application.yml.ejs | 2 +- .../resources/config/bootstrap-prod.yml.ejs | 2 +- .../main/resources/config/bootstrap.yml.ejs | 2 +- .../cql/changelog/create-tables.cql.ejs | 2 +- .../changelog/insert_default_users.cql.ejs | 2 +- .../config/cql/create-keyspace-prod.cql.ejs | 2 +- .../config/cql/create-keyspace.cql.ejs | 2 +- .../config/cql/drop-keyspace.cql.ejs | 2 +- .../changelog/initial_schema.xml.ejs | 2 +- .../resources/i18n/messages.properties.ejs | 2 +- .../src/main/resources/logback-spring.xml.ejs | 2 +- .../src/main/resources/swagger/api.yml.ejs | 2 +- .../package/AbstractCassandraTest.java.ejs | 2 +- .../java/package/AbstractNeo4jIT.java.ejs | 2 +- .../src/test/java/package/ArchTest.java.ejs | 2 +- .../java/package/CassandraKeyspaceIT.java.ejs | 2 +- ...ReactiveSqlTestContainerExtension.java.ejs | 2 +- .../RedisTestContainerExtension.java.ejs | 2 +- .../config/DatabaseConfigurationIT.java.ejs | 4 +-- .../JHipsterBlockHoundIntegration.java.ejs | 4 +-- .../config/NoOpMailConfiguration.java.ejs | 24 +++++++------- .../config/OAuth2TestConfiguration.java.ejs | 24 +++++++------- ...SecurityBeanOverrideConfiguration.java.ejs | 2 +- .../StaticResourcesWebConfigurerTest.java.ejs | 2 +- .../config/TestSecurityConfiguration.java.ejs | 4 +-- .../package/config/WebConfigurerTest.java.ejs | 2 +- .../WebConfigurerTestController.java.ejs | 2 +- .../timezone/HibernateTimeZoneIT.java.ejs | 2 +- .../java/package/cucumber/CucumberIT.java.ejs | 2 +- .../CucumberTestContextConfiguration.java.ejs | 2 +- .../cucumber/stepdefs/StepDefs.java.ejs | 2 +- .../cucumber/stepdefs/UserStepDefs.java.ejs | 2 +- ...waggerBasePathRewritingFilterTest.java.ejs | 2 +- ...CustomN1qlCouchbaseRepositoryTest.java.ejs | 2 +- ...SearchRepositoryMockConfiguration.java.ejs | 2 +- .../timezone/DateTimeWrapper.java.ejs | 2 +- .../DateTimeWrapperRepository.java.ejs | 2 +- .../DomainUserDetailsServiceIT.java.ejs | 2 +- .../security/OAuth2TokenMockUtil.java.ejs | 2 +- .../security/SecurityUtilsUnitTest.java.ejs | 2 +- .../security/jwt/JWTFilterTest.java.ejs | 2 +- .../security/jwt/TokenProviderTest.java.ejs | 2 +- .../oauth2/AudienceValidatorTest.java.ejs | 4 +-- .../AuthorizationHeaderUtilTest.java.ejs | 4 +-- .../oauth2/CookieCollectionTest.java.ejs | 4 +-- .../oauth2/CookieTokenExtractorTest.java.ejs | 4 +-- .../OAuth2AuthenticationServiceTest.java.ejs | 4 +-- .../oauth2/OAuth2CookieHelperTest.java.ejs | 4 +-- .../package/service/MailServiceIT.java.ejs | 2 +- .../package/service/UserServiceIT.java.ejs | 2 +- .../service/mapper/UserMapperTest.java.ejs | 2 +- .../web/rest/AccountResourceIT.java.ejs | 2 +- .../rest/AccountResourceIT_oauth2.java.ejs | 2 +- ...ountResourceIT_skipUserManagement.java.ejs | 2 +- .../rest/ClientForwardControllerTest.java.ejs | 2 +- .../package/web/rest/KafkaResourceIT.java.ejs | 2 +- .../web/rest/LogoutResourceIT.java.ejs | 4 +-- .../java/package/web/rest/TestUtil.java.ejs | 2 +- .../web/rest/UserJWTControllerIT.java.ejs | 2 +- .../package/web/rest/UserResourceIT.java.ejs | 2 +- .../rest/WithUnauthenticatedMockUser.java.ejs | 24 +++++++------- .../errors/ExceptionTranslatorIT.java.ejs | 2 +- ...ExceptionTranslatorTestController.java.ejs | 2 +- .../config/application-testcontainers.yml.ejs | 2 +- .../test/resources/config/application.yml.ejs | 2 +- .../test/resources/config/bootstrap.yml.ejs | 2 +- .../src/test/resources/logback.xml.ejs | 2 +- generators/spring-controller/index.js | 2 +- generators/spring-controller/prompts.js | 2 +- .../java/package/web/rest/Resource.java.ejs | 2 +- .../java/package/web/rest/ResourceIT.java.ejs | 2 +- generators/spring-service/index.js | 2 +- .../java/package/service/Service.java.ejs | 2 +- .../package/service/impl/ServiceImpl.java.ejs | 2 +- generators/statistics.js | 2 +- generators/upgrade-config/index.js | 2 +- generators/upgrade/index.js | 2 +- generators/utils.js | 2 +- .../jdl-to-json-basic-entity-converter.js | 4 +-- .../jdl-to-json-field-converter.js | 4 +-- .../jdl-to-json-option-converter.js | 4 +-- .../jdl-to-json-relationship-converter.js | 4 +-- ...jdl-with-applications-to-json-converter.js | 4 +-- ...l-without-application-to-json-converter.js | 4 +-- .../json-to-jdl-application-converter.js | 4 +-- jdl/converters/json-to-jdl-converter.js | 4 +-- .../json-to-jdl-entity-converter.js | 4 +-- .../json-to-jdl-option-converter.js | 4 +-- .../application-converter.js | 4 +-- .../deployment-converter.js | 4 +-- .../entity-converter.js | 4 +-- .../enum-converter.js | 4 +-- .../field-converter.js | 4 +-- .../option-converter.js | 4 +-- .../parsed-jdl-to-jdl-object-converter.js | 7 ++-- .../relationship-converter.js | 4 +-- .../validation-converter.js | 4 +-- .../jhipster-application-exporter.js | 4 +-- .../jhipster-application-formatter.js | 4 +-- jdl/exporters/export-utils.js | 4 +-- jdl/exporters/jdl-exporter.js | 4 +-- jdl/exporters/jhipster-deployment-exporter.js | 4 +-- jdl/exporters/jhipster-entity-exporter.js | 4 +-- jdl/jdl-importer.js | 7 ++-- jdl/jhipster/application-options.js | 4 +-- jdl/jhipster/application-types.js | 4 +-- jdl/jhipster/binary-options.js | 4 +-- jdl/jhipster/database-types.js | 4 +-- jdl/jhipster/default-application-options.js | 4 +-- jdl/jhipster/deployment-options.js | 4 +-- jdl/jhipster/entity-table-name-creator.js | 7 ++-- jdl/jhipster/field-types.js | 4 +-- jdl/jhipster/json-entity.js | 4 +-- jdl/jhipster/relationship-options.js | 4 +-- jdl/jhipster/relationship-types.js | 4 +-- jdl/jhipster/reserved-keywords.js | 4 +-- jdl/jhipster/reserved-keywords/angular.js | 4 +-- jdl/jhipster/reserved-keywords/cassandra.js | 4 +-- jdl/jhipster/reserved-keywords/couchbase.js | 4 +-- jdl/jhipster/reserved-keywords/java.js | 4 +-- jdl/jhipster/reserved-keywords/jhipster.js | 4 +-- jdl/jhipster/reserved-keywords/mssql.js | 4 +-- jdl/jhipster/reserved-keywords/mysql.js | 4 +-- jdl/jhipster/reserved-keywords/neo4j.js | 4 +-- jdl/jhipster/reserved-keywords/oracle.js | 4 +-- jdl/jhipster/reserved-keywords/postgresql.js | 4 +-- jdl/jhipster/reserved-keywords/typescript.js | 4 +-- jdl/jhipster/unary-options.js | 4 +-- jdl/jhipster/validations.js | 4 +-- jdl/linters/entity-linter.js | 7 ++-- jdl/linters/enum-linter.js | 7 ++-- jdl/linters/field-linter.js | 7 ++-- jdl/linters/issues/abstract-issue.js | 7 ++-- jdl/linters/issues/entity-issue.js | 7 ++-- jdl/linters/issues/enum-issue.js | 4 +-- jdl/linters/issues/field-issue.js | 4 +-- jdl/linters/issues/issues.js | 7 ++-- jdl/linters/issues/relationship-issue.js | 4 +-- jdl/linters/jdl-linter.js | 7 ++-- jdl/linters/relationship-linter.js | 7 ++-- jdl/linters/rule-levels.js | 7 ++-- jdl/linters/rule.js | 7 ++-- jdl/linters/rules.js | 7 ++-- jdl/models/abstract-jdl-option.js | 4 +-- ...an-jdl-application-configuration-option.js | 4 +-- ...er-jdl-application-configuration-option.js | 4 +-- .../jdl-application-configuration-factory.js | 4 +-- .../jdl-application-configuration-option.js | 4 +-- jdl/models/jdl-application-configuration.js | 4 +-- jdl/models/jdl-application-entities.js | 4 +-- jdl/models/jdl-application-factory.js | 4 +-- jdl/models/jdl-application.js | 4 +-- jdl/models/jdl-binary-option.js | 4 +-- jdl/models/jdl-deployment.js | 4 +-- jdl/models/jdl-entity.js | 4 +-- jdl/models/jdl-enum.js | 4 +-- jdl/models/jdl-enums.js | 4 +-- jdl/models/jdl-field.js | 4 +-- jdl/models/jdl-object-merger.js | 4 +-- jdl/models/jdl-object.js | 4 +-- jdl/models/jdl-options.js | 4 +-- jdl/models/jdl-relationship.js | 4 +-- jdl/models/jdl-relationships.js | 4 +-- jdl/models/jdl-unary-option.js | 4 +-- jdl/models/jdl-validation.js | 4 +-- ...st-jdl-application-configuration-option.js | 4 +-- ...ng-jdl-application-configuration-option.js | 4 +-- jdl/parsing/api.js | 7 ++-- jdl/parsing/exports.js | 4 +-- .../generated/generated-serialized-grammar.js | 7 ++-- jdl/parsing/jdl-ast-builder-visitor.js | 4 +-- jdl/parsing/jdl-parser.js | 7 ++-- jdl/parsing/jdl-post-parsing-tasks.js | 4 +-- jdl/parsing/lexer/application-tokens.js | 4 +-- jdl/parsing/lexer/deployment-tokens.js | 4 +-- jdl/parsing/lexer/lexer.js | 7 ++-- jdl/parsing/lexer/minmax-tokens.js | 4 +-- jdl/parsing/lexer/option-tokens.js | 4 +-- jdl/parsing/lexer/relationship-type-tokens.js | 4 +-- jdl/parsing/lexer/shared-tokens.js | 4 +-- jdl/parsing/lexer/token-creator.js | 4 +-- jdl/parsing/lexer/validation-tokens.js | 4 +-- .../self-checks/parsing-system-checker.js | 7 ++-- .../self-checks/token-collector-visitor.js | 7 ++-- jdl/parsing/validator.js | 7 ++-- jdl/readers/file-reader.js | 4 +-- jdl/readers/jdl-reader.js | 4 +-- jdl/readers/json-file-reader.js | 4 +-- jdl/readers/json-reader.js | 4 +-- jdl/utils/array-utils.js | 4 +-- jdl/utils/deprecation-utils.js | 4 +-- jdl/utils/file-utils.js | 4 +-- jdl/utils/format-utils.js | 4 +-- jdl/utils/object-utils.js | 4 +-- jdl/utils/objects/logger.js | 4 +-- jdl/utils/set-utils.js | 4 +-- jdl/utils/string-utils.js | 4 +-- jdl/validators/application-validator.js | 7 ++-- jdl/validators/binary-option-validator.js | 4 +-- jdl/validators/deployment-validator.js | 7 ++-- jdl/validators/entity-validator.js | 7 ++-- jdl/validators/enum-validator.js | 7 ++-- jdl/validators/field-validator.js | 7 ++-- .../jdl-with-application-validator.js | 4 +-- .../jdl-without-application-validator.js | 4 +-- jdl/validators/option-validator.js | 4 +-- jdl/validators/relationship-validator.js | 4 +-- jdl/validators/unary-option-validator.js | 4 +-- jdl/validators/validation-validator.js | 7 ++-- jdl/validators/validator.js | 7 ++-- test/cli/environment-builder.spec.js | 2 +- test/enforcements.spec.js | 2 +- test/integration-test-reproducibility.spec.js | 2 +- ...basic-entity-information-converter.spec.js | 4 +-- .../jdl-to-json-field-converter.spec.js | 4 +-- .../jdl-to-json-option-converter.spec.js | 4 +-- ...jdl-to-json-relationship-converter.spec.js | 4 +-- ...ith-applications-to-json-converter.spec.js | 4 +-- ...hout-application-to-json-converter.spec.js | 4 +-- .../json-to-jdl-application-converter.spec.js | 4 +-- .../converters/json-to-jdl-converter.spec.js | 4 +-- .../json-to-jdl-entity-converter.spec.js | 4 +-- .../json-to-jdl-option-converter.spec.js | 4 +-- .../application-converter.spec.js | 4 +-- .../deployment-converter.spec.js | 4 +-- .../entity-converter.spec.js | 4 +-- .../enum-converter.spec.js | 4 +-- .../field-converter.spec.js | 4 +-- .../option-converter.spec.js | 4 +-- ...parsed-jdl-to-jdl-object-converter.spec.js | 4 +-- .../relationship-converter.spec.js | 4 +-- .../validation-converter.spec.js | 4 +-- test/jdl/exporters/export-utils.spec.js | 4 +-- test/jdl/exporters/jdl-exporter.spec.js | 4 +-- .../jhipster-application-exporter.spec.js | 4 +-- .../jhipster-deployment-exporter.spec.js | 4 +-- .../jhipster-entity-exporter.spec.js | 4 +-- test/jdl/grammar/dsl-api.spec.js | 4 +-- test/jdl/grammar/grammar.spec.js | 4 +-- test/jdl/grammar/lexer.spec.js | 4 +-- test/jdl/grammar/validator.spec.js | 4 +-- test/jdl/integration/test.spec.js | 4 +-- test/jdl/jdl-importer.spec.js | 4 +-- test/jdl/jhipster/application-options.spec.js | 4 +-- test/jdl/jhipster/application-types.spec.js | 4 +-- test/jdl/jhipster/binary-options.spec.js | 4 +-- test/jdl/jhipster/database-types.spec.js | 4 +-- .../default-application-options.spec.js | 4 +-- test/jdl/jhipster/deployment-options.spec.js | 4 +-- .../entity-table-name-creator.spec.js | 7 ++-- test/jdl/jhipster/field-types.spec.js | 4 +-- test/jdl/jhipster/json-entity.spec.js | 4 +-- .../jdl/jhipster/relationship-options.spec.js | 4 +-- test/jdl/jhipster/relationship-types.spec.js | 4 +-- test/jdl/jhipster/reserved-keywords.spec.js | 4 +-- test/jdl/jhipster/unary-options.spec.js | 4 +-- test/jdl/jhipster/validations.spec.js | 4 +-- test/jdl/linter/issues/entity-issue.spec.js | 4 +-- test/jdl/linter/issues/enum-issue.spec.js | 4 +-- test/jdl/linter/issues/field-issue.spec.js | 4 +-- test/jdl/linter/issues/issues.spec.js | 7 ++-- .../linter/issues/relationship-issue.spec.js | 4 +-- test/jdl/linter/jdl-linter.spec.js | 7 ++-- test/jdl/linter/rule.spec.js | 4 +-- test/jdl/linter/rules.spec.js | 7 ++-- test/jdl/models/abstract-jdl-option.spec.js | 4 +-- ...-application-configuration-factory.spec.js | 4 +-- .../jdl-application-configuration.spec.js | 4 +-- .../models/jdl-application-entities.spec.js | 4 +-- .../models/jdl-application-factory.spec.js | 4 +-- test/jdl/models/jdl-application.spec.js | 4 +-- test/jdl/models/jdl-binary-option.spec.js | 4 +-- test/jdl/models/jdl-deployment.spec.js | 4 +-- test/jdl/models/jdl-entity.spec.js | 4 +-- test/jdl/models/jdl-enum-value.spec.js | 4 +-- test/jdl/models/jdl-enum.spec.js | 4 +-- test/jdl/models/jdl-enums.spec.js | 4 +-- test/jdl/models/jdl-field.spec.js | 4 +-- test/jdl/models/jdl-object-merger.spec.js | 4 +-- test/jdl/models/jdl-object.spec.js | 4 +-- test/jdl/models/jdl-options.spec.js | 4 +-- test/jdl/models/jdl-relationship.spec.js | 4 +-- test/jdl/models/jdl-relationships.spec.js | 4 +-- test/jdl/models/jdl-unary-option.spec.js | 4 +-- test/jdl/models/jdl-validation.spec.js | 4 +-- test/jdl/parsing/lexer/token-creator.spec.js | 4 +-- test/jdl/readers/file-reader.spec.js | 4 +-- test/jdl/readers/jdl-reader.spec.js | 4 +-- test/jdl/readers/json-file-reader.spec.js | 4 +-- test/jdl/readers/json-reader.spec.js | 4 +-- test/jdl/utils/array-utils.spec.js | 4 +-- test/jdl/utils/files-utils.spec.js | 4 +-- test/jdl/utils/format-utils.spec.js | 4 +-- test/jdl/utils/object-utils.spec.js | 4 +-- test/jdl/utils/set-utils.spec.js | 4 +-- test/jdl/utils/string_utils.spec.js | 4 +-- .../validators/application-validator.spec.js | 4 +-- .../binary-option-validator.spec.js | 4 +-- .../validators/deployment-validator.spec.js | 7 ++-- test/jdl/validators/entity-validator.spec.js | 4 +-- test/jdl/validators/enum-validator.spec.js | 7 ++-- test/jdl/validators/field-validator.spec.js | 4 +-- .../jdl-with-application-validator.spec.js | 4 +-- .../jdl-without-application-validator.spec.js | 4 +-- .../validators/relationship-validator.spec.js | 4 +-- .../validators/unary-option-validator.spec.js | 4 +-- .../validators/validation-validator.spec.js | 4 +-- .../blueprint-cli-shared/cli/sharedOptions.js | 2 +- .../generators/bar/index.js | 2 +- .../generators/foo/index.js | 2 +- .../ngx-blueprint/HelloKotlin.kt.ejs | 12 ++++--- .../templates/ngx-blueprint/HelloVue.html.ejs | 12 ++++--- .../ngx-blueprint/custom-i18n.json.ejs | 2 +- test/utils-entity.spec.js | 2 +- test/utils-field.spec.js | 2 +- utils/blueprint.js | 2 +- utils/db.js | 2 +- utils/entity.js | 2 +- utils/faker.js | 2 +- utils/field.js | 2 +- utils/index.js | 2 +- utils/language.js | 2 +- utils/liquibase.js | 2 +- utils/relationship.js | 2 +- 1478 files changed, 2053 insertions(+), 1977 deletions(-) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index 20c993168b3e..4132172d95a3 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -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/.github/workflows/generator.yml b/.github/workflows/generator.yml index 0d4c707d57ef..0dda67735503 100644 --- a/.github/workflows/generator.yml +++ b/.github/workflows/generator.yml @@ -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/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index ea12e6787419..4dad80fd4d8c 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -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/.github/workflows/incremental-changelog.yml b/.github/workflows/incremental-changelog.yml index b87ca5ed745f..2d03154be5d9 100644 --- a/.github/workflows/incremental-changelog.yml +++ b/.github/workflows/incremental-changelog.yml @@ -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/.github/workflows/label-cleanup.yml b/.github/workflows/label-cleanup.yml index 2fedb9de2170..14f2c9e9bef2 100644 --- a/.github/workflows/label-cleanup.yml +++ b/.github/workflows/label-cleanup.yml @@ -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/.github/workflows/react.yml b/.github/workflows/react.yml index 27189910e939..7df93fa7661e 100644 --- a/.github/workflows/react.yml +++ b/.github/workflows/react.yml @@ -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/.github/workflows/triage.yml b/.github/workflows/triage.yml index 34279bf2655a..97e756a3ea1a 100644 --- a/.github/workflows/triage.yml +++ b/.github/workflows/triage.yml @@ -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/.github/workflows/vue.yml b/.github/workflows/vue.yml index cc5d85817e86..ca5d033189e3 100644 --- a/.github/workflows/vue.yml +++ b/.github/workflows/vue.yml @@ -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/.github/workflows/webflux.yml b/.github/workflows/webflux.yml index d6dc3922c8a5..b750d446518a 100644 --- a/.github/workflows/webflux.yml +++ b/.github/workflows/webflux.yml @@ -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/LICENSE.txt b/LICENSE.txt index d201c649f393..f7d6ae824a06 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -195,7 +195,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/azure-pipelines.yml b/azure-pipelines.yml index 218f73300c4c..39639009cbb8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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/cli/cli.js b/cli/cli.js index e7e786b2e8e5..07301667af4f 100644 --- a/cli/cli.js +++ b/cli/cli.js @@ -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/cli/commands.js b/cli/commands.js index 6fbdabf80e38..471b1c76fc8d 100644 --- a/cli/commands.js +++ b/cli/commands.js @@ -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/cli/download.js b/cli/download.js index 07beb20d9350..58a04d048293 100644 --- a/cli/download.js +++ b/cli/download.js @@ -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/cli/environment-builder.js b/cli/environment-builder.js index 552e3ea637b3..e436227468ad 100644 --- a/cli/environment-builder.js +++ b/cli/environment-builder.js @@ -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/cli/import-jdl.js b/cli/import-jdl.js index 5a7b1c3ab1f3..05fd7fc92f65 100644 --- a/cli/import-jdl.js +++ b/cli/import-jdl.js @@ -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/cli/jdl.js b/cli/jdl.js index 354cb64061bb..2bcbe90787f5 100644 --- a/cli/jdl.js +++ b/cli/jdl.js @@ -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/cli/jhipster-command.js b/cli/jhipster-command.js index d5cc45fdea0d..1a6fe62ad050 100644 --- a/cli/jhipster-command.js +++ b/cli/jhipster-command.js @@ -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/cli/jhipster.js b/cli/jhipster.js index 668207d404a4..12089039a814 100755 --- a/cli/jhipster.js +++ b/cli/jhipster.js @@ -9,7 +9,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/cli/program.js b/cli/program.js index d1f87eb3f165..bc4a15d0eaec 100644 --- a/cli/program.js +++ b/cli/program.js @@ -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/cli/utils.js b/cli/utils.js index c315fc6fc54d..f0d877a1973f 100644 --- a/cli/utils.js +++ b/cli/utils.js @@ -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/app/index.js b/generators/app/index.js index ec3a8270bf1b..b7393ea2b5ad 100644 --- a/generators/app/index.js +++ b/generators/app/index.js @@ -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/app/prompts.js b/generators/app/prompts.js index 983908a38c21..7f5f9727dc5d 100644 --- a/generators/app/prompts.js +++ b/generators/app/prompts.js @@ -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/aws-containers/aws-client.js b/generators/aws-containers/aws-client.js index 66ed836453b9..d398cb69bddd 100644 --- a/generators/aws-containers/aws-client.js +++ b/generators/aws-containers/aws-client.js @@ -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/aws-containers/index.js b/generators/aws-containers/index.js index 1b2a1742612f..ded29311121a 100644 --- a/generators/aws-containers/index.js +++ b/generators/aws-containers/index.js @@ -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/aws-containers/lib/cloudFormation.js b/generators/aws-containers/lib/cloudFormation.js index fa2b858e52b5..098d7457c925 100644 --- a/generators/aws-containers/lib/cloudFormation.js +++ b/generators/aws-containers/lib/cloudFormation.js @@ -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/aws-containers/lib/ecr.js b/generators/aws-containers/lib/ecr.js index 16d1b0bbbc2b..8e29fc262002 100644 --- a/generators/aws-containers/lib/ecr.js +++ b/generators/aws-containers/lib/ecr.js @@ -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/aws-containers/lib/ssm.js b/generators/aws-containers/lib/ssm.js index c378ba5220cc..5e7922ffdbeb 100644 --- a/generators/aws-containers/lib/ssm.js +++ b/generators/aws-containers/lib/ssm.js @@ -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/aws-containers/lib/utils.js b/generators/aws-containers/lib/utils.js index 62d9e9eeb2f1..5f83084ef187 100644 --- a/generators/aws-containers/lib/utils.js +++ b/generators/aws-containers/lib/utils.js @@ -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/aws-containers/prompts.js b/generators/aws-containers/prompts.js index e7680eea87e6..fac1648160ee 100644 --- a/generators/aws-containers/prompts.js +++ b/generators/aws-containers/prompts.js @@ -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/aws-containers/templates/AwsSSMConfiguration.java.ejs b/generators/aws-containers/templates/AwsSSMConfiguration.java.ejs index 7a4dc2348904..f1817d984f7e 100644 --- a/generators/aws-containers/templates/AwsSSMConfiguration.java.ejs +++ b/generators/aws-containers/templates/AwsSSMConfiguration.java.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/aws-containers/templates/application.template.yml.ejs b/generators/aws-containers/templates/application.template.yml.ejs index 63f3e2d08226..59dc13d95ea3 100644 --- a/generators/aws-containers/templates/application.template.yml.ejs +++ b/generators/aws-containers/templates/application.template.yml.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/aws-containers/templates/base.template.yml.ejs b/generators/aws-containers/templates/base.template.yml.ejs index 6ae1ca04c774..0a170785a7ce 100644 --- a/generators/aws-containers/templates/base.template.yml.ejs +++ b/generators/aws-containers/templates/base.template.yml.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/aws-containers/templates/bootstrap-aws.yml.ejs b/generators/aws-containers/templates/bootstrap-aws.yml.ejs index 6e386f653142..87bc9e3db59a 100644 --- a/generators/aws-containers/templates/bootstrap-aws.yml.ejs +++ b/generators/aws-containers/templates/bootstrap-aws.yml.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/aws/index.js b/generators/aws/index.js index f4cbca63f1f5..12224f1a5b9b 100644 --- a/generators/aws/index.js +++ b/generators/aws/index.js @@ -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/aws/lib/aws.js b/generators/aws/lib/aws.js index 2e914fd83c1b..5564757a4e36 100644 --- a/generators/aws/lib/aws.js +++ b/generators/aws/lib/aws.js @@ -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/aws/lib/eb.js b/generators/aws/lib/eb.js index ff9c687c72d1..ba225188db16 100644 --- a/generators/aws/lib/eb.js +++ b/generators/aws/lib/eb.js @@ -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/aws/lib/iam.js b/generators/aws/lib/iam.js index d985a2865015..e88147960aaa 100644 --- a/generators/aws/lib/iam.js +++ b/generators/aws/lib/iam.js @@ -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/aws/lib/rds.js b/generators/aws/lib/rds.js index 431cd6847dcc..d935c9bdd6ee 100644 --- a/generators/aws/lib/rds.js +++ b/generators/aws/lib/rds.js @@ -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/aws/lib/s3.js b/generators/aws/lib/s3.js index 0959ff5f7f60..d34c7ad8b372 100644 --- a/generators/aws/lib/s3.js +++ b/generators/aws/lib/s3.js @@ -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/aws/prompts.js b/generators/aws/prompts.js index 9c8489ccac84..c012f8616ecc 100644 --- a/generators/aws/prompts.js +++ b/generators/aws/prompts.js @@ -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/azure-app-service/index.js b/generators/azure-app-service/index.js index c4dce5252e8e..88f314e09b4a 100644 --- a/generators/azure-app-service/index.js +++ b/generators/azure-app-service/index.js @@ -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/azure-app-service/templates/application-azure.yml.ejs b/generators/azure-app-service/templates/application-azure.yml.ejs index 2528ee94e7f9..5bd1b9ea42f0 100644 --- a/generators/azure-app-service/templates/application-azure.yml.ejs +++ b/generators/azure-app-service/templates/application-azure.yml.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/azure-spring-cloud/index.js b/generators/azure-spring-cloud/index.js index c0f8ff8ccc23..254598bc1299 100644 --- a/generators/azure-spring-cloud/index.js +++ b/generators/azure-spring-cloud/index.js @@ -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/azure-spring-cloud/templates/application-azure.yml.ejs b/generators/azure-spring-cloud/templates/application-azure.yml.ejs index dec85a7e5c53..3b8001d92533 100644 --- a/generators/azure-spring-cloud/templates/application-azure.yml.ejs +++ b/generators/azure-spring-cloud/templates/application-azure.yml.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/azure-spring-cloud/templates/bootstrap-azure.yml.ejs b/generators/azure-spring-cloud/templates/bootstrap-azure.yml.ejs index d214a0e9258a..a9d240f20bfe 100644 --- a/generators/azure-spring-cloud/templates/bootstrap-azure.yml.ejs +++ b/generators/azure-spring-cloud/templates/bootstrap-azure.yml.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/ci-cd/index.js b/generators/ci-cd/index.js index f8abec024338..ae869221a7b5 100644 --- a/generators/ci-cd/index.js +++ b/generators/ci-cd/index.js @@ -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/ci-cd/prompts.js b/generators/ci-cd/prompts.js index 36977443babd..d7a45b92e42e 100644 --- a/generators/ci-cd/prompts.js +++ b/generators/ci-cd/prompts.js @@ -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/ci-cd/templates/.gitlab-ci.yml.ejs b/generators/ci-cd/templates/.gitlab-ci.yml.ejs index 4465c0f54f67..c85fcc98a2f9 100644 --- a/generators/ci-cd/templates/.gitlab-ci.yml.ejs +++ b/generators/ci-cd/templates/.gitlab-ci.yml.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/ci-cd/templates/azure-pipelines.yml.ejs b/generators/ci-cd/templates/azure-pipelines.yml.ejs index 15d65983f745..4c7e94876608 100644 --- a/generators/ci-cd/templates/azure-pipelines.yml.ejs +++ b/generators/ci-cd/templates/azure-pipelines.yml.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/ci-cd/templates/circle.yml.ejs b/generators/ci-cd/templates/circle.yml.ejs index 7ceed58a2698..ed8762659d8b 100644 --- a/generators/ci-cd/templates/circle.yml.ejs +++ b/generators/ci-cd/templates/circle.yml.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/ci-cd/templates/docker-registry.yml.ejs b/generators/ci-cd/templates/docker-registry.yml.ejs index 580c1207c489..9c80ffd76808 100644 --- a/generators/ci-cd/templates/docker-registry.yml.ejs +++ b/generators/ci-cd/templates/docker-registry.yml.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/ci-cd/templates/github-ci.yml.ejs b/generators/ci-cd/templates/github-ci.yml.ejs index 634080247372..a5e21306461a 100644 --- a/generators/ci-cd/templates/github-ci.yml.ejs +++ b/generators/ci-cd/templates/github-ci.yml.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/ci-cd/templates/jenkins/Jenkinsfile.ejs b/generators/ci-cd/templates/jenkins/Jenkinsfile.ejs index 5d3a2a6f9028..a7b3e0ef32ee 100644 --- a/generators/ci-cd/templates/jenkins/Jenkinsfile.ejs +++ b/generators/ci-cd/templates/jenkins/Jenkinsfile.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/ci-cd/templates/jenkins/jenkins.yml.ejs b/generators/ci-cd/templates/jenkins/jenkins.yml.ejs index 7506b92d619c..7e23a7154d65 100644 --- a/generators/ci-cd/templates/jenkins/jenkins.yml.ejs +++ b/generators/ci-cd/templates/jenkins/jenkins.yml.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/ci-cd/templates/travis.yml.ejs b/generators/ci-cd/templates/travis.yml.ejs index 0c8ae4e4e1dd..88afc9d52140 100644 --- a/generators/ci-cd/templates/travis.yml.ejs +++ b/generators/ci-cd/templates/travis.yml.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/cleanup.js b/generators/cleanup.js index 1615a3dbfe7b..90a06ddc1a89 100644 --- a/generators/cleanup.js +++ b/generators/cleanup.js @@ -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/client/files-angular.js b/generators/client/files-angular.js index edabe5e037a8..ae1a51b94f19 100644 --- a/generators/client/files-angular.js +++ b/generators/client/files-angular.js @@ -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/client/files-common.js b/generators/client/files-common.js index 5466729f7ec4..d7aef8698e5f 100644 --- a/generators/client/files-common.js +++ b/generators/client/files-common.js @@ -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/client/files-react.js b/generators/client/files-react.js index a458c6415dba..9c8028ff2ac0 100644 --- a/generators/client/files-react.js +++ b/generators/client/files-react.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see https://jhipster.github.io/ + * 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"); * 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/client/files-vue.js b/generators/client/files-vue.js index 3a5d60e09f8f..b1c568c86213 100644 --- a/generators/client/files-vue.js +++ b/generators/client/files-vue.js @@ -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/client/index.js b/generators/client/index.js index 4a7daeef8843..48c2e2b164f1 100644 --- a/generators/client/index.js +++ b/generators/client/index.js @@ -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/client/needle-api/needle-client-angular.js b/generators/client/needle-api/needle-client-angular.js index b96221d23a69..63ebb7945caa 100644 --- a/generators/client/needle-api/needle-client-angular.js +++ b/generators/client/needle-api/needle-client-angular.js @@ -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/client/needle-api/needle-client-i18n.js b/generators/client/needle-api/needle-client-i18n.js index abcd0a6d3cf4..ea4f37837d5f 100644 --- a/generators/client/needle-api/needle-client-i18n.js +++ b/generators/client/needle-api/needle-client-i18n.js @@ -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/client/needle-api/needle-client-react.js b/generators/client/needle-api/needle-client-react.js index e7433e43d606..77e57d3ee031 100644 --- a/generators/client/needle-api/needle-client-react.js +++ b/generators/client/needle-api/needle-client-react.js @@ -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/client/needle-api/needle-client-vue.js b/generators/client/needle-api/needle-client-vue.js index af2fb8a3d86d..2a85af25fcee 100644 --- a/generators/client/needle-api/needle-client-vue.js +++ b/generators/client/needle-api/needle-client-vue.js @@ -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/client/needle-api/needle-client-webpack.js b/generators/client/needle-api/needle-client-webpack.js index 113df0ef1af1..81bd7c80d8ae 100644 --- a/generators/client/needle-api/needle-client-webpack.js +++ b/generators/client/needle-api/needle-client-webpack.js @@ -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/client/needle-api/needle-client.js b/generators/client/needle-api/needle-client.js index 3a8456ea5a9b..4f447bc81b44 100644 --- a/generators/client/needle-api/needle-client.js +++ b/generators/client/needle-api/needle-client.js @@ -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/client/prompts.js b/generators/client/prompts.js index aa79b2de1f76..9c2df1b95a11 100644 --- a/generators/client/prompts.js +++ b/generators/client/prompts.js @@ -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/client/templates/angular/.browserslistrc.ejs b/generators/client/templates/angular/.browserslistrc.ejs index f0ee0eb3a3dc..cfc50b9a47af 100644 --- a/generators/client/templates/angular/.browserslistrc.ejs +++ b/generators/client/templates/angular/.browserslistrc.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/client/templates/angular/.eslintrc.json.ejs b/generators/client/templates/angular/.eslintrc.json.ejs index d71f9e1d6456..fcb6a4509a15 100644 --- a/generators/client/templates/angular/.eslintrc.json.ejs +++ b/generators/client/templates/angular/.eslintrc.json.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/client/templates/angular/angular.json.ejs b/generators/client/templates/angular/angular.json.ejs index 888a06772dbc..5ea31c0a6e20 100644 --- a/generators/client/templates/angular/angular.json.ejs +++ b/generators/client/templates/angular/angular.json.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/client/templates/angular/jest.conf.js.ejs b/generators/client/templates/angular/jest.conf.js.ejs index 08814323ed91..051b6c450074 100644 --- a/generators/client/templates/angular/jest.conf.js.ejs +++ b/generators/client/templates/angular/jest.conf.js.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/client/templates/angular/package.json.ejs b/generators/client/templates/angular/package.json.ejs index a9d4ee7f0425..d9d83e161c6f 100644 --- a/generators/client/templates/angular/package.json.ejs +++ b/generators/client/templates/angular/package.json.ejs @@ -1,20 +1,20 @@ <%# -Copyright 2013-2020 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. -This file is part of the JHipster project, see https://www.jhipster.tech/ -for more information. + 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"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + 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, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -%> { "name": "<%= dasherizedBaseName %>", diff --git a/generators/client/templates/angular/src/main/webapp/404.html.ejs b/generators/client/templates/angular/src/main/webapp/404.html.ejs index 95fcdda3b28a..f8e09732f771 100644 --- a/generators/client/templates/angular/src/main/webapp/404.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/404.html.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/client/templates/angular/src/main/webapp/app/account/account.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/account.module.ts.ejs index 32425c2ff999..ec87da016ba0 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/account.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/account.module.ts.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/client/templates/angular/src/main/webapp/app/account/account.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/account.route.ts.ejs index 8a66b791893b..bcf9357645db 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/account.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/account.route.ts.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/client/templates/angular/src/main/webapp/app/account/activate/activate.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.html.ejs index 8058e5177894..b5727c4e0fad 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.html.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/client/templates/angular/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs index 2fea51316aec..9c08d51a9b2d 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.spec.ts.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/client/templates/angular/src/main/webapp/app/account/activate/activate.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.ts.ejs index 62bcfa053e8f..1d608e6c7feb 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.ts.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/client/templates/angular/src/main/webapp/app/account/activate/activate.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.route.ts.ejs index ce60ebb23c63..5c01ef7f4f75 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.route.ts.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/client/templates/angular/src/main/webapp/app/account/activate/activate.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.service.ts.ejs index 9ebd0a390910..a2a65a3935b3 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.service.ts.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/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs index d526da372633..6740ae1da3be 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.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/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs index 22e1917ae39b..66ae735593cb 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.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/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs index ca92dab31ef1..fba46688052e 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.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/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts.ejs index 804bf9692554..b8b8653f7b27 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.route.ts.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/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts.ejs index 656d871fec45..5d5d2fc26aba 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts.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/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs index 2b4d0dbb9dbf..7cb9a8191fbe 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.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/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs index 7d656cd2fabf..905deca31eb1 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.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/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts.ejs index 65f46c1afe9f..7bbebea008c0 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts.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/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts.ejs index 37713c05a078..2432bbb28792 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.route.ts.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/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts.ejs index 1843878fb84e..ee962a5c3612 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts.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/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.html.ejs index 093a3e8b17d5..d3f9858ca53e 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.html.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/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.scss.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.scss.ejs index 134516b02178..12f41300a9bb 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.scss.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.scss.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/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs index c21e8ae0f11a..8f439fab4ff8 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.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/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs index 78232848b6f2..7978d9b2168a 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.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/client/templates/angular/src/main/webapp/app/account/password/password.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.html.ejs index 6fd8eb306796..ba695675fef0 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.html.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/client/templates/angular/src/main/webapp/app/account/password/password.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.spec.ts.ejs index 672073bb2a77..7c80ea021ff0 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.spec.ts.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/client/templates/angular/src/main/webapp/app/account/password/password.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.ts.ejs index 7d97d46de46b..a9de551707ad 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.ts.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/client/templates/angular/src/main/webapp/app/account/password/password.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password.route.ts.ejs index 422de4e25b09..f42187ec59e4 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password/password.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password/password.route.ts.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/client/templates/angular/src/main/webapp/app/account/password/password.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/password/password.service.ts.ejs index 8fb014b36691..202f8a788d5f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/password/password.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/password/password.service.ts.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/client/templates/angular/src/main/webapp/app/account/register/register.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.html.ejs index 2458601b3e81..e00fecc293ab 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.html.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/client/templates/angular/src/main/webapp/app/account/register/register.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.spec.ts.ejs index 3b8944907969..82e1dfce342f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.spec.ts.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/client/templates/angular/src/main/webapp/app/account/register/register.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.ts.ejs index d7fe54fd357a..93ce0aa58116 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.ts.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/client/templates/angular/src/main/webapp/app/account/register/register.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/register/register.route.ts.ejs index f74b586ec25e..9d0ef57a4447 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/register/register.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/register/register.route.ts.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/client/templates/angular/src/main/webapp/app/account/register/register.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/register/register.service.ts.ejs index d857d9de3a3f..f59bad219a2f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/register/register.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/register/register.service.ts.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/client/templates/angular/src/main/webapp/app/account/sessions/session.model.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/sessions/session.model.ts.ejs index 7d19df4e70cd..5cd62367895f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/sessions/session.model.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/sessions/session.model.ts.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/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.html.ejs index 8df857734503..4277932f3301 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.html.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/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs index 58cedd32d613..bf5ba0c63a88 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.spec.ts.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/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.ts.ejs index a7485a54fb78..8a718f744785 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.component.ts.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/client/templates/angular/src/main/webapp/app/account/sessions/sessions.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.route.ts.ejs index f87a4ab16a86..15920c9d6317 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.route.ts.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/client/templates/angular/src/main/webapp/app/account/sessions/sessions.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.service.ts.ejs index 5be815ef2bb1..065e63b0f25e 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/sessions/sessions.service.ts.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/client/templates/angular/src/main/webapp/app/account/settings/settings.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.html.ejs index 7a02c94f582b..433f9ac741cf 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.html.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/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs index 32a3d7c1605f..be6fec124276 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.spec.ts.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/client/templates/angular/src/main/webapp/app/account/settings/settings.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.ts.ejs index 7a63e079d7b8..cdaa49b87bd2 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.ts.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/client/templates/angular/src/main/webapp/app/account/settings/settings.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.route.ts.ejs index 9a89745ba37a..78f664c3f49e 100644 --- a/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.route.ts.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/client/templates/angular/src/main/webapp/app/admin/admin-routing.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/admin-routing.module.ts.ejs index 69a326e75ab1..94be25d235d8 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/admin-routing.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/admin-routing.module.ts.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/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.html.ejs index 16d136faedbd..3f5b59b3b7c6 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.html.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/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs index 8d6ed314def4..a958a925fb8a 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.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/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.ts.ejs index aabd139f93e3..f033a204e3d3 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.ts.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/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.model.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.model.ts.ejs index 593ad94fd0ca..7cfafe2a8082 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.model.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.model.ts.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/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.module.ts.ejs index 89933b6b4b4c..b612c28699ed 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.module.ts.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/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.route.ts.ejs index c382cbbbb422..fa9319f404a1 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.route.ts.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/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs index bcf46b27832b..dbe8df82efe2 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.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/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs index e27edda61efe..1b2e5ebe298b 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.service.ts.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/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.html.ejs index b7548cfffb89..ec0a5efdf0e7 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.html.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/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.scss.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.scss.ejs index 57ffeb63ee8c..80a7a0e8a031 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.scss.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.scss.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/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.ts.ejs index 5027db503d88..e6c456dd2806 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.component.ts.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/client/templates/angular/src/main/webapp/app/admin/docs/docs.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.module.ts.ejs index f22a629484f7..2c15f6db46fb 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.module.ts.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/client/templates/angular/src/main/webapp/app/admin/docs/docs.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.route.ts.ejs index e0b75e1939da..aac6bc9f5b37 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/docs/docs.route.ts.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/client/templates/angular/src/main/webapp/app/admin/gateway/gateway-route.model.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway-route.model.ts.ejs index 6f09567b884a..49e2f5cb3f62 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway-route.model.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway-route.model.ts.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/client/templates/angular/src/main/webapp/app/admin/gateway/gateway-routes.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway-routes.service.ts.ejs index 29d667c84fbc..4ec945d921c2 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway-routes.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway-routes.service.ts.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/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.component.html.ejs index cfacbc0e882a..08d077a32a6c 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.component.html.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/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs index 1d116b7b4462..e1561b7f47ad 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.component.ts.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/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.module.ts.ejs index 91ee017712b8..f18cf80f221d 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.module.ts.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/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.route.ts.ejs index 52a8dd34102e..c6902abad7d1 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.route.ts.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/client/templates/angular/src/main/webapp/app/admin/health/health.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.html.ejs index e1bc95ff26f1..131d232ede5b 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.html.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/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.ejs index 82188a4e85a2..e63b0125641f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.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/client/templates/angular/src/main/webapp/app/admin/health/health.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.ts.ejs index 8355e7bcda7f..379a625f537b 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.ts.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/client/templates/angular/src/main/webapp/app/admin/health/health.model.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.model.ts.ejs index 4ec7f94a1bc1..19b553a9837f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/health/health.model.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.model.ts.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/client/templates/angular/src/main/webapp/app/admin/health/health.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.module.ts.ejs index ec8ea5cf9443..9f77944821e6 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/health/health.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.module.ts.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/client/templates/angular/src/main/webapp/app/admin/health/health.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.route.ts.ejs index 18bf758e878e..a4f82f7e5f54 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/health/health.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.route.ts.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/client/templates/angular/src/main/webapp/app/admin/health/health.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.service.ts.ejs index efbdc0f36f7d..57d55e9f4e4c 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/health/health.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/health/health.service.ts.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/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.html.ejs index cb75c4753f22..8b99a19f72e9 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.html.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/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.ts.ejs index c4e948354502..b7ef0c013150 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.ts.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/client/templates/angular/src/main/webapp/app/admin/logs/log.model.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/logs/log.model.ts.ejs index ff1da2befc73..04bd3de3f8c8 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/logs/log.model.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/logs/log.model.ts.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/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.html.ejs index f205dbb78c09..0f721f1fecfe 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.html.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/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs index 819ced28aea6..8427a484ef47 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.spec.ts.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/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.ts.ejs index 01435c2d6425..7e6bef547e94 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.ts.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/client/templates/angular/src/main/webapp/app/admin/logs/logs.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.module.ts.ejs index 8a5a7368a98f..c9151aa4f153 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.module.ts.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/client/templates/angular/src/main/webapp/app/admin/logs/logs.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.route.ts.ejs index f76ef6b48e3b..7029a98a9df1 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.route.ts.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/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.spec.ts.ejs index 15d7f521511b..54f95d5344cc 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.spec.ts.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/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.ts.ejs index 66a449a93198..e686420028c8 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.service.ts.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/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs index 91a827ceca13..19453668a000 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.html.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/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts.ejs index d3610d1af297..332e793e67db 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-memory/jvm-memory.component.ts.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/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.html.ejs index d767ae460aed..037de4f8b3a9 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.html.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/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.ts.ejs index 8c03f830a29f..5418bfcfd12e 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/jvm-threads/jvm-threads.component.ts.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/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs index 288ca074bbd4..f651008f0778 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.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/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.ejs index 76230b0879f8..e1a8d3974e16 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.ts.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/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs index e6b9c712735e..2ab0cc4e601b 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.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/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts.ejs index a9070ddc8c27..6537a2ce3f92 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts.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/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs index f9ae5cac4025..448bb221c7f0 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.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/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts.ejs index 038c79698315..4f358819d098 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts.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/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs index 9e9ce6603e55..0e15ea2af95e 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.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/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts.ejs index 0f4151c5e58e..bc5fc52315ee 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts.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/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs index 22b6e58e9daf..e1a0353a030c 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.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/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts.ejs index b2a93b757f2a..0fab1380f71c 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts.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/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs index b3e2e7732b7e..64a527095a3a 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.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/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts.ejs index 034b3e848db7..1d2ed3970a47 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.ts.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/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs index a0dfd1708733..32e0512cc848 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.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/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.ts.ejs index 149fe969233f..4d8d086ef606 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.ts.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/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.html.ejs index aed731ae881a..3ab50b5da4d0 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.html.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/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs index 4efac27686fd..4156873de7af 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.spec.ts.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/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.ts.ejs index d1f7f530d5c2..1b2f3eb2a743 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.ts.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/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.model.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.model.ts.ejs index 9bfc8f52245d..37d32a2f54a3 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.model.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.model.ts.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/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.module.ts.ejs index 4ea0142a2b5e..df569ac61870 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.module.ts.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/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.route.ts.ejs index f736458c5bbd..01f1428e1a63 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.route.ts.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/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.spec.ts.ejs index b7a57c39d663..74ad3700db4f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.spec.ts.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/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.ts.ejs index c692986ef5a2..e888207358f3 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.service.ts.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/client/templates/angular/src/main/webapp/app/admin/tracker/tracker.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/tracker/tracker.component.html.ejs index 012e33f65bc9..92911c6dfaa0 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/tracker/tracker.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/tracker/tracker.component.html.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/client/templates/angular/src/main/webapp/app/admin/tracker/tracker.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/tracker/tracker.component.ts.ejs index a89ec659e21a..ac34aeac5411 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/tracker/tracker.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/tracker/tracker.component.ts.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/client/templates/angular/src/main/webapp/app/admin/tracker/tracker.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/tracker/tracker.module.ts.ejs index 684947902dcd..cae8adb98d57 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/tracker/tracker.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/tracker/tracker.module.ts.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/client/templates/angular/src/main/webapp/app/admin/tracker/tracker.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/tracker/tracker.route.ts.ejs index d042b0d65c6f..4601983c3a34 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/tracker/tracker.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/tracker/tracker.route.ts.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/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs index f2f5f2b878f8..a09a58dccac3 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.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/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs index 6da6d4d77cbe..99f8aa065d6f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.spec.ts.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/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.ts.ejs index 82d59c3bffce..9911efa8ddc4 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.ts.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/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html.ejs index 497a69925785..621309aeb19b 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html.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/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs index 3ae83f6ee097..a4712175c9a8 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.spec.ts.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/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.ts.ejs index 959508ee5f34..f34a5ea35e06 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.ts.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/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs index 558bc2451d0c..47467070c27b 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.html.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/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs index b45785927078..f288b964f9bc 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.spec.ts.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/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs index 4a475cef6641..4c23449ec3da 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.ts.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/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs index 376418fb712c..040e9595e57b 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.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/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs index 8d869190ecee..69d55a7e5b54 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.spec.ts.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/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.ts.ejs index 51a77ad59e2d..6548a1735a7d 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.ts.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/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.module.ts.ejs index 98c0acd909fb..af7c495c54d1 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.module.ts.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/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.route.ts.ejs index ded03b9e779c..43b2e507ae00 100644 --- a/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/admin/user-management/user-management.route.ts.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/client/templates/angular/src/main/webapp/app/app-routing.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/app-routing.module.ts.ejs index 81e6997735ac..f3a53e9e742d 100644 --- a/generators/client/templates/angular/src/main/webapp/app/app-routing.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/app-routing.module.ts.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/client/templates/angular/src/main/webapp/app/app.constants.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/app.constants.ts.ejs index 59bac4d4fe23..ef8ae7d0779f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/app.constants.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/app.constants.ts.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/client/templates/angular/src/main/webapp/app/app.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/app.module.ts.ejs index 4d2f177cc497..7acaac5b03a9 100644 --- a/generators/client/templates/angular/src/main/webapp/app/app.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/app.module.ts.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/client/templates/angular/src/main/webapp/app/config/authority.constants.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/authority.constants.ts.ejs index f50429c64a37..2179e0993fac 100644 --- a/generators/client/templates/angular/src/main/webapp/app/config/authority.constants.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/config/authority.constants.ts.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/client/templates/angular/src/main/webapp/app/config/datepicker-adapter.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/datepicker-adapter.ts.ejs index f4545e9b86e4..7018ab3d8231 100644 --- a/generators/client/templates/angular/src/main/webapp/app/config/datepicker-adapter.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/config/datepicker-adapter.ts.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/client/templates/angular/src/main/webapp/app/config/dayjs.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/dayjs.ts.ejs index a0a47455474a..c04eea0babb0 100644 --- a/generators/client/templates/angular/src/main/webapp/app/config/dayjs.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/config/dayjs.ts.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/client/templates/angular/src/main/webapp/app/config/error.constants.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/error.constants.ts.ejs index e3c9df97f596..8e3eccf6df3a 100644 --- a/generators/client/templates/angular/src/main/webapp/app/config/error.constants.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/config/error.constants.ts.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/client/templates/angular/src/main/webapp/app/config/font-awesome-icons.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/font-awesome-icons.ts.ejs index f674564073bc..f77af44dada9 100644 --- a/generators/client/templates/angular/src/main/webapp/app/config/font-awesome-icons.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/config/font-awesome-icons.ts.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/client/templates/angular/src/main/webapp/app/config/input.constants.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/input.constants.ts.ejs index c8fe951707cf..3e83a04cae07 100644 --- a/generators/client/templates/angular/src/main/webapp/app/config/input.constants.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/config/input.constants.ts.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/client/templates/angular/src/main/webapp/app/config/language.constants.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/language.constants.ts.ejs index 10ed5ac0e5c0..edff5360cee1 100644 --- a/generators/client/templates/angular/src/main/webapp/app/config/language.constants.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/config/language.constants.ts.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/client/templates/angular/src/main/webapp/app/config/pagination.constants.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/pagination.constants.ts.ejs index 0e51f22a9877..27adda831e5a 100644 --- a/generators/client/templates/angular/src/main/webapp/app/config/pagination.constants.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/config/pagination.constants.ts.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/client/templates/angular/src/main/webapp/app/config/translation.config.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/translation.config.ts.ejs index 9d49a18a52f5..1044bae993f9 100644 --- a/generators/client/templates/angular/src/main/webapp/app/config/translation.config.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/config/translation.config.ts.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/client/templates/angular/src/main/webapp/app/config/uib-pagination.config.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/config/uib-pagination.config.ts.ejs index 01a39f731bd2..eb6c84ae215d 100644 --- a/generators/client/templates/angular/src/main/webapp/app/config/uib-pagination.config.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/config/uib-pagination.config.ts.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/client/templates/angular/src/main/webapp/app/core/auth/account.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.spec.ts.ejs index 63bb8b3cfd91..e41460e45172 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.spec.ts.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/client/templates/angular/src/main/webapp/app/core/auth/account.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.ts.ejs index 333bb1c97bb8..a91bd45f47ac 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/auth/account.service.ts.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/client/templates/angular/src/main/webapp/app/core/auth/auth-jwt.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/auth/auth-jwt.service.ts.ejs index 0eea4e25579b..3db6bc5eefd7 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/auth/auth-jwt.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/auth/auth-jwt.service.ts.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/client/templates/angular/src/main/webapp/app/core/auth/auth-session.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/auth/auth-session.service.ts.ejs index 17ebf539496f..8a22536f2b51 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/auth/auth-session.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/auth/auth-session.service.ts.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/client/templates/angular/src/main/webapp/app/core/auth/csrf.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/auth/csrf.service.ts.ejs index a3d4405689c7..9a83ffd8d714 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/auth/csrf.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/auth/csrf.service.ts.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/client/templates/angular/src/main/webapp/app/core/auth/state-storage.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/auth/state-storage.service.ts.ejs index fc1ae9bb29ba..54e41df8f710 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/auth/state-storage.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/auth/state-storage.service.ts.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/client/templates/angular/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs index 6e5efaf9ae50..b56a08693f97 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/auth/user-route-access.service.ts.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/client/templates/angular/src/main/webapp/app/core/interceptor/auth-expired.interceptor.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/interceptor/auth-expired.interceptor.ts.ejs index 8f43e3faec0f..7f8d82e04ac3 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/interceptor/auth-expired.interceptor.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/interceptor/auth-expired.interceptor.ts.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/client/templates/angular/src/main/webapp/app/core/interceptor/auth.interceptor.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/interceptor/auth.interceptor.ts.ejs index f29901dc1077..e091af20d00f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/interceptor/auth.interceptor.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/interceptor/auth.interceptor.ts.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/client/templates/angular/src/main/webapp/app/core/interceptor/error-handler.interceptor.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/interceptor/error-handler.interceptor.ts.ejs index 4cbe63f7c4a2..b2b77371844a 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/interceptor/error-handler.interceptor.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/interceptor/error-handler.interceptor.ts.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/client/templates/angular/src/main/webapp/app/core/interceptor/index.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/interceptor/index.ts.ejs index 5ec4e5792eef..ea6c657f8c7b 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/interceptor/index.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/interceptor/index.ts.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/client/templates/angular/src/main/webapp/app/core/interceptor/notification.interceptor.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/interceptor/notification.interceptor.ts.ejs index f15f462425a0..53bf4d162782 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/interceptor/notification.interceptor.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/interceptor/notification.interceptor.ts.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/client/templates/angular/src/main/webapp/app/core/request/request-util.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/request/request-util.ts.ejs index 6fe0e244a5b9..5e9e421dc1a7 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/request/request-util.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/request/request-util.ts.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/client/templates/angular/src/main/webapp/app/core/request/request.model.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/request/request.model.ts.ejs index d10e0fa9f30a..26f27e59fb21 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/request/request.model.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/request/request.model.ts.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/client/templates/angular/src/main/webapp/app/core/tracker/tracker-activity.model.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/tracker/tracker-activity.model.ts.ejs index e8579262ad14..f36085e9a4b3 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/tracker/tracker-activity.model.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/tracker/tracker-activity.model.ts.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/client/templates/angular/src/main/webapp/app/core/tracker/tracker.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/tracker/tracker.service.ts.ejs index 2e8d228dbedd..6e71d89ab692 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/tracker/tracker.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/tracker/tracker.service.ts.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/client/templates/angular/src/main/webapp/app/core/user/account.model.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/user/account.model.ts.ejs index 104d55f9c1c1..74b12718296b 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/user/account.model.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/user/account.model.ts.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/client/templates/angular/src/main/webapp/app/core/user/user.model.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/user/user.model.ts.ejs index ced6201094d3..2baef48e4d09 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/user/user.model.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/user/user.model.ts.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/client/templates/angular/src/main/webapp/app/core/user/user.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/user/user.service.spec.ts.ejs index 22f67084e34c..37a15767505b 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/user/user.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/user/user.service.spec.ts.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/client/templates/angular/src/main/webapp/app/core/user/user.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/user/user.service.ts.ejs index 29a3c61f38c6..7af5ef102ed1 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/user/user.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/user/user.service.ts.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/client/templates/angular/src/main/webapp/app/core/util/alert.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/util/alert.service.spec.ts.ejs index 63c422eb19bf..0bc1678ed6e7 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/util/alert.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/util/alert.service.spec.ts.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/client/templates/angular/src/main/webapp/app/core/util/alert.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/util/alert.service.ts.ejs index 36204eb6b52f..3468930cdb7e 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/util/alert.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/util/alert.service.ts.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/client/templates/angular/src/main/webapp/app/core/util/data-util.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.spec.ts.ejs index 7194aad14e9b..51b391cd2e70 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.spec.ts.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/client/templates/angular/src/main/webapp/app/core/util/data-util.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.ts.ejs index 61857d15f174..a0442e8521d4 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/util/data-util.service.ts.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/client/templates/angular/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs index 2069035303ad..855075949c5d 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/util/event-manager.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/util/event-manager.service.spec.ts.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/client/templates/angular/src/main/webapp/app/core/util/event-manager.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/util/event-manager.service.ts.ejs index 0af5331a453a..787c4ce1b859 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/util/event-manager.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/util/event-manager.service.ts.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/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.spec.ts.ejs index 765d6f8cf3ab..eb28e6af5985 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.spec.ts.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/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.ts.ejs index aeff5bf41965..0658c0a2ada0 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/util/parse-links.service.ts.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/client/templates/angular/src/main/webapp/app/entities/entity-routing.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/entities/entity-routing.module.ts.ejs index b29f436c12f4..d18cf8caf9f6 100644 --- a/generators/client/templates/angular/src/main/webapp/app/entities/entity-routing.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/entities/entity-routing.module.ts.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/client/templates/angular/src/main/webapp/app/home/home.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/home/home.component.html.ejs index bc747eccfc4b..7b52d5eed462 100644 --- a/generators/client/templates/angular/src/main/webapp/app/home/home.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/home/home.component.html.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/client/templates/angular/src/main/webapp/app/home/home.component.scss.ejs b/generators/client/templates/angular/src/main/webapp/app/home/home.component.scss.ejs index e097773625c2..04a96f7d5e42 100644 --- a/generators/client/templates/angular/src/main/webapp/app/home/home.component.scss.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/home/home.component.scss.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/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.ejs index b8129684af87..fa08b1a16a36 100644 --- a/generators/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/home/home.component.spec.ts.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/client/templates/angular/src/main/webapp/app/home/home.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/home/home.component.ts.ejs index b0aa25b2a195..f2b185e45e0f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/home/home.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/home/home.component.ts.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/client/templates/angular/src/main/webapp/app/home/home.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/home/home.module.ts.ejs index cc32cd2cea69..b856c810af9b 100644 --- a/generators/client/templates/angular/src/main/webapp/app/home/home.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/home/home.module.ts.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/client/templates/angular/src/main/webapp/app/home/home.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/home/home.route.ts.ejs index f85d37bdcea1..ab088e0bcb14 100644 --- a/generators/client/templates/angular/src/main/webapp/app/home/home.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/home/home.route.ts.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/client/templates/angular/src/main/webapp/app/layouts/error/error.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/error/error.component.html.ejs index 78ea65c04a19..081705f59488 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/error/error.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/error/error.component.html.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/client/templates/angular/src/main/webapp/app/layouts/error/error.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/error/error.component.ts.ejs index 01ebda43e6fd..e74697f228eb 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/error/error.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/error/error.component.ts.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/client/templates/angular/src/main/webapp/app/layouts/error/error.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/error/error.route.ts.ejs index adb6e4c1b295..6083efeccec0 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/error/error.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/error/error.route.ts.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/client/templates/angular/src/main/webapp/app/layouts/footer/footer.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/footer/footer.component.html.ejs index bd366ed10bcf..573ae88c1d99 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/footer/footer.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/footer/footer.component.html.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/client/templates/angular/src/main/webapp/app/layouts/footer/footer.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/footer/footer.component.ts.ejs index 310fbf5ce401..347b8f8249c0 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/footer/footer.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/footer/footer.component.ts.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/client/templates/angular/src/main/webapp/app/layouts/main/main.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.html.ejs index e38bc0690732..1ff7cd3fc37e 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.html.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/client/templates/angular/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs index 1a82cd2c3a85..1ab9c756a983 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.spec.ts.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/client/templates/angular/src/main/webapp/app/layouts/main/main.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.ts.ejs index d1476db5c34f..11e2e5a6ed4a 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/main/main.component.ts.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/client/templates/angular/src/main/webapp/app/layouts/navbar/active-menu.directive.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/active-menu.directive.ts.ejs index 0602a8bc3e5b..4d54e2b4c950 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/active-menu.directive.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/active-menu.directive.ts.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/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs index 54fda69fbfcf..6ddd61653e6d 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.html.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/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.scss.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.scss.ejs index 300cd79dfe86..2686f5f7e41a 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.scss.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.scss.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/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs index c76edf691fbd..5b2f4a6723c6 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.spec.ts.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/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs index 36564e24d02f..5399570bd765 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.ts.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/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.route.ts.ejs index 0babbece80d1..dd8f552e10d3 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.route.ts.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/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.scss.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.scss.ejs index 296380399682..903753723750 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.scss.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.scss.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/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs index b316571bdca9..a1e37aa62e37 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.ts.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/client/templates/angular/src/main/webapp/app/layouts/profiles/profile-info.model.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/profile-info.model.ts.ejs index 49ca91c3e1c2..14d8cda7b107 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/profile-info.model.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/profile-info.model.ts.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/client/templates/angular/src/main/webapp/app/layouts/profiles/profile.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/profile.service.ts.ejs index bc79d0763015..69f62950f128 100644 --- a/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/profile.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/profile.service.ts.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/client/templates/angular/src/main/webapp/app/login/login.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/login/login.component.html.ejs index 6e1b3c9ce114..1b800130f022 100644 --- a/generators/client/templates/angular/src/main/webapp/app/login/login.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/login/login.component.html.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/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.ejs index 7526e660763e..e079b6a1abe5 100644 --- a/generators/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/login/login.component.spec.ts.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/client/templates/angular/src/main/webapp/app/login/login.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/login/login.component.ts.ejs index 20804d524071..9afbb9beedbb 100644 --- a/generators/client/templates/angular/src/main/webapp/app/login/login.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/login/login.component.ts.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/client/templates/angular/src/main/webapp/app/login/login.model.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/login/login.model.ts.ejs index 24109679e3ec..df8281ff677c 100644 --- a/generators/client/templates/angular/src/main/webapp/app/login/login.model.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/login/login.model.ts.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/client/templates/angular/src/main/webapp/app/login/login.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/login/login.module.ts.ejs index 6421db0d68f8..f2cc605d45e7 100644 --- a/generators/client/templates/angular/src/main/webapp/app/login/login.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/login/login.module.ts.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/client/templates/angular/src/main/webapp/app/login/login.route.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/login/login.route.ts.ejs index 07394aac7fc5..73305928fdd8 100644 --- a/generators/client/templates/angular/src/main/webapp/app/login/login.route.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/login/login.route.ts.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/client/templates/angular/src/main/webapp/app/login/login.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/login/login.service.ts.ejs index a9d5c1e88509..f25d23fd246a 100644 --- a/generators/client/templates/angular/src/main/webapp/app/login/login.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/login/login.service.ts.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/client/templates/angular/src/main/webapp/app/login/logout.model.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/login/logout.model.ts.ejs index 4f2a7dceeea1..e87577992771 100644 --- a/generators/client/templates/angular/src/main/webapp/app/login/logout.model.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/login/logout.model.ts.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/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.html.ejs index 7a72b0110b2a..ec221fdfd6b2 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.html.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/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.spec.ts.ejs index d451b40912ea..2133bd6ab45b 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.spec.ts.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/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs index 0c1e6b33b7db..8273b55c17c4 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.component.ts.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/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.model.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.model.ts.ejs index 6c6609bedc4f..5c165e3cadd0 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.model.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert-error.model.ts.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/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.html.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.html.ejs index 7a72b0110b2a..ec221fdfd6b2 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.html.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/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs index 922746df7fbd..7483affd010f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.spec.ts.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/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.ts.ejs index f5f78ded6950..589ba46a6a07 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/alert/alert.component.ts.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/client/templates/angular/src/main/webapp/app/shared/date/duration.pipe.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/date/duration.pipe.ts.ejs index f4cd734c6001..5efffac6a4e5 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/date/duration.pipe.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/date/duration.pipe.ts.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/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.spec.ts.ejs index 5b4eaecb9044..3eec34d77896 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.spec.ts.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/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.ts.ejs index bceb4da171b5..75e2fafda31d 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-date.pipe.ts.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/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.spec.ts.ejs index fcee787dd298..333d5f8905a4 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.spec.ts.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/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.ts.ejs index f3192a188e9d..7c866988dbc8 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/date/format-medium-datetime.pipe.ts.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/client/templates/angular/src/main/webapp/app/shared/has-any-authority.directive.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/has-any-authority.directive.ts.ejs index 7368ef936725..2c8f37b5caf2 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/has-any-authority.directive.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/has-any-authority.directive.ts.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/client/templates/angular/src/main/webapp/app/shared/item-count.component.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/item-count.component.spec.ts.ejs index 1404dd94fcc8..a044566460ff 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/item-count.component.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/item-count.component.spec.ts.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/client/templates/angular/src/main/webapp/app/shared/item-count.component.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/item-count.component.ts.ejs index 5307921a6d87..1b072e93474f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/item-count.component.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/item-count.component.ts.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/client/templates/angular/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts.ejs index 53ed028d7990..f926bbb161e1 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/language/find-language-from-key.pipe.ts.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/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.spec.ts.ejs index 3495d2adb7a7..270bd11ea66c 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.spec.ts.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/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.ts.ejs index df5001c3d6a8..10cbcfd1ca41 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/language/translate.directive.ts.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/client/templates/angular/src/main/webapp/app/shared/shared-libs.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/shared-libs.module.ts.ejs index 77142d48643a..dc680d7cfa33 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/shared-libs.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/shared-libs.module.ts.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/client/templates/angular/src/main/webapp/app/shared/shared.module.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/shared.module.ts.ejs index b47b691084f2..011dd6965030 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/shared.module.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/shared.module.ts.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/client/templates/angular/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.ejs index a6cbe8470190..08ee3e8151c2 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort-by.directive.spec.ts.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/client/templates/angular/src/main/webapp/app/shared/sort/sort-by.directive.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort-by.directive.ts.ejs index 959d394c80f3..0d195920862a 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort-by.directive.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort-by.directive.ts.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/client/templates/angular/src/main/webapp/app/shared/sort/sort.directive.spec.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort.directive.spec.ts.ejs index f0c7a8dc6060..8af8b98cbd09 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort.directive.spec.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort.directive.spec.ts.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/client/templates/angular/src/main/webapp/app/shared/sort/sort.directive.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort.directive.ts.ejs index b1d8476899a8..3db708b8392d 100644 --- a/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort.directive.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/shared/sort/sort.directive.ts.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/client/templates/angular/src/main/webapp/content/css/loading.css.ejs b/generators/client/templates/angular/src/main/webapp/content/css/loading.css.ejs index 9c0f96006fa5..5935142a5b1a 100644 --- a/generators/client/templates/angular/src/main/webapp/content/css/loading.css.ejs +++ b/generators/client/templates/angular/src/main/webapp/content/css/loading.css.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/client/templates/angular/src/main/webapp/content/scss/_bootstrap-variables.scss.ejs b/generators/client/templates/angular/src/main/webapp/content/scss/_bootstrap-variables.scss.ejs index 89bced3d9c11..931e748419a7 100644 --- a/generators/client/templates/angular/src/main/webapp/content/scss/_bootstrap-variables.scss.ejs +++ b/generators/client/templates/angular/src/main/webapp/content/scss/_bootstrap-variables.scss.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/client/templates/angular/src/main/webapp/content/scss/global.scss.ejs b/generators/client/templates/angular/src/main/webapp/content/scss/global.scss.ejs index cc329842e8c9..fc15a5c0dfc4 100644 --- a/generators/client/templates/angular/src/main/webapp/content/scss/global.scss.ejs +++ b/generators/client/templates/angular/src/main/webapp/content/scss/global.scss.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/client/templates/angular/src/main/webapp/content/scss/vendor.scss.ejs b/generators/client/templates/angular/src/main/webapp/content/scss/vendor.scss.ejs index aafa83d14981..8fa3ce34dd6a 100644 --- a/generators/client/templates/angular/src/main/webapp/content/scss/vendor.scss.ejs +++ b/generators/client/templates/angular/src/main/webapp/content/scss/vendor.scss.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/client/templates/angular/src/main/webapp/index.html.ejs b/generators/client/templates/angular/src/main/webapp/index.html.ejs index 2cab1f5a6651..e313239122b5 100644 --- a/generators/client/templates/angular/src/main/webapp/index.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/index.html.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/client/templates/angular/src/main/webapp/main.ts.ejs b/generators/client/templates/angular/src/main/webapp/main.ts.ejs index dfff012a76ae..4a5fd801b956 100644 --- a/generators/client/templates/angular/src/main/webapp/main.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/main.ts.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/client/templates/angular/src/main/webapp/polyfills.ts.ejs b/generators/client/templates/angular/src/main/webapp/polyfills.ts.ejs index 0d64d7d89868..e768f4166dbd 100644 --- a/generators/client/templates/angular/src/main/webapp/polyfills.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/polyfills.ts.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/client/templates/angular/src/main/webapp/robots.txt.ejs b/generators/client/templates/angular/src/main/webapp/robots.txt.ejs index 0400819541fd..a5a57657c0f2 100644 --- a/generators/client/templates/angular/src/main/webapp/robots.txt.ejs +++ b/generators/client/templates/angular/src/main/webapp/robots.txt.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/client/templates/angular/src/main/webapp/swagger-ui/index.html.ejs b/generators/client/templates/angular/src/main/webapp/swagger-ui/index.html.ejs index c616a17defbf..080b423f2dae 100644 --- a/generators/client/templates/angular/src/main/webapp/swagger-ui/index.html.ejs +++ b/generators/client/templates/angular/src/main/webapp/swagger-ui/index.html.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/client/templates/angular/src/test/javascript/e2e/account/account.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/e2e/account/account.spec.ts.ejs index 5def4a4985b5..8c01b2d7a714 100644 --- a/generators/client/templates/angular/src/test/javascript/e2e/account/account.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/e2e/account/account.spec.ts.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/client/templates/angular/src/test/javascript/e2e/admin/administration.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/e2e/admin/administration.spec.ts.ejs index bafdcf1f5471..aab77b24d351 100644 --- a/generators/client/templates/angular/src/test/javascript/e2e/admin/administration.spec.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/e2e/admin/administration.spec.ts.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/client/templates/angular/src/test/javascript/e2e/page-objects/jhi-page-objects.ts.ejs b/generators/client/templates/angular/src/test/javascript/e2e/page-objects/jhi-page-objects.ts.ejs index c705a9edd0d7..078439b93173 100644 --- a/generators/client/templates/angular/src/test/javascript/e2e/page-objects/jhi-page-objects.ts.ejs +++ b/generators/client/templates/angular/src/test/javascript/e2e/page-objects/jhi-page-objects.ts.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/client/templates/angular/src/test/javascript/protractor.conf.js.ejs b/generators/client/templates/angular/src/test/javascript/protractor.conf.js.ejs index 975801daa7a3..dd77ccbaac05 100644 --- a/generators/client/templates/angular/src/test/javascript/protractor.conf.js.ejs +++ b/generators/client/templates/angular/src/test/javascript/protractor.conf.js.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/client/templates/angular/tsconfig.app.json.ejs b/generators/client/templates/angular/tsconfig.app.json.ejs index bbae98055aaa..ac5fe1c30d70 100644 --- a/generators/client/templates/angular/tsconfig.app.json.ejs +++ b/generators/client/templates/angular/tsconfig.app.json.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/client/templates/angular/tsconfig.e2e.json.ejs b/generators/client/templates/angular/tsconfig.e2e.json.ejs index 4d332375cf51..d8c6313d69dd 100644 --- a/generators/client/templates/angular/tsconfig.e2e.json.ejs +++ b/generators/client/templates/angular/tsconfig.e2e.json.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/client/templates/angular/tsconfig.json.ejs b/generators/client/templates/angular/tsconfig.json.ejs index f37f3b89ba05..8506822a21db 100644 --- a/generators/client/templates/angular/tsconfig.json.ejs +++ b/generators/client/templates/angular/tsconfig.json.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/client/templates/angular/tsconfig.spec.json.ejs b/generators/client/templates/angular/tsconfig.spec.json.ejs index 29df351f190b..74360b2c7102 100644 --- a/generators/client/templates/angular/tsconfig.spec.json.ejs +++ b/generators/client/templates/angular/tsconfig.spec.json.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/client/templates/angular/webpack/proxy.conf.js.ejs b/generators/client/templates/angular/webpack/proxy.conf.js.ejs index 8c06b25b1ba3..40b5ab8b7e85 100644 --- a/generators/client/templates/angular/webpack/proxy.conf.js.ejs +++ b/generators/client/templates/angular/webpack/proxy.conf.js.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/client/templates/angular/webpack/webpack.custom.js.ejs b/generators/client/templates/angular/webpack/webpack.custom.js.ejs index 58ba594a6bbb..eb0b5c98edf0 100644 --- a/generators/client/templates/angular/webpack/webpack.custom.js.ejs +++ b/generators/client/templates/angular/webpack/webpack.custom.js.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/client/templates/common/.eslintignore.ejs b/generators/client/templates/common/.eslintignore.ejs index 965183b0c3d5..02663638cd38 100644 --- a/generators/client/templates/common/.eslintignore.ejs +++ b/generators/client/templates/common/.eslintignore.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/client/templates/common/src/main/webapp/content/scss/rtl.scss.ejs b/generators/client/templates/common/src/main/webapp/content/scss/rtl.scss.ejs index 14811963293a..e877b55ae16f 100644 --- a/generators/client/templates/common/src/main/webapp/content/scss/rtl.scss.ejs +++ b/generators/client/templates/common/src/main/webapp/content/scss/rtl.scss.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/client/templates/react/.eslintrc.json.ejs b/generators/client/templates/react/.eslintrc.json.ejs index 177e68a16fc7..0eef3d324e96 100644 --- a/generators/client/templates/react/.eslintrc.json.ejs +++ b/generators/client/templates/react/.eslintrc.json.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/client/templates/react/package.json.ejs b/generators/client/templates/react/package.json.ejs index a4173aa20221..96af5a38f066 100644 --- a/generators/client/templates/react/package.json.ejs +++ b/generators/client/templates/react/package.json.ejs @@ -1,20 +1,20 @@ <%# -Copyright 2013-2020 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. -This file is part of the JHipster project, see https://www.jhipster.tech/ -for more information. + 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"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + 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, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -%> { "name": "<%= dasherizedBaseName %>", diff --git a/generators/client/templates/react/postcss.config.js.ejs b/generators/client/templates/react/postcss.config.js.ejs index cf0e835f1699..f06e92e3b876 100644 --- a/generators/client/templates/react/postcss.config.js.ejs +++ b/generators/client/templates/react/postcss.config.js.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/client/templates/react/src/main/webapp/404.html.ejs b/generators/client/templates/react/src/main/webapp/404.html.ejs index 95fcdda3b28a..f8e09732f771 100644 --- a/generators/client/templates/react/src/main/webapp/404.html.ejs +++ b/generators/client/templates/react/src/main/webapp/404.html.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/client/templates/react/src/main/webapp/app/_bootstrap-variables.scss.ejs b/generators/client/templates/react/src/main/webapp/app/_bootstrap-variables.scss.ejs index 89d95e051713..dcc87296f6dd 100644 --- a/generators/client/templates/react/src/main/webapp/app/_bootstrap-variables.scss.ejs +++ b/generators/client/templates/react/src/main/webapp/app/_bootstrap-variables.scss.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/client/templates/react/src/main/webapp/app/app.scss.ejs b/generators/client/templates/react/src/main/webapp/app/app.scss.ejs index caef88b4f42b..4299a6bf5846 100644 --- a/generators/client/templates/react/src/main/webapp/app/app.scss.ejs +++ b/generators/client/templates/react/src/main/webapp/app/app.scss.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/client/templates/react/src/main/webapp/app/app.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/app.tsx.ejs index 91b3c2da590f..e512ec91c608 100644 --- a/generators/client/templates/react/src/main/webapp/app/app.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/app.tsx.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/client/templates/react/src/main/webapp/app/config/axios-interceptor.ts.ejs b/generators/client/templates/react/src/main/webapp/app/config/axios-interceptor.ts.ejs index de785765e48e..f4f822d6b2f9 100644 --- a/generators/client/templates/react/src/main/webapp/app/config/axios-interceptor.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/config/axios-interceptor.ts.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/client/templates/react/src/main/webapp/app/config/constants.ts.ejs b/generators/client/templates/react/src/main/webapp/app/config/constants.ts.ejs index b7d5eef66945..22d05cd99223 100644 --- a/generators/client/templates/react/src/main/webapp/app/config/constants.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/config/constants.ts.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/client/templates/react/src/main/webapp/app/config/devtools.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/config/devtools.tsx.ejs index 18eb2a3ca516..8a2182e25593 100644 --- a/generators/client/templates/react/src/main/webapp/app/config/devtools.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/config/devtools.tsx.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/client/templates/react/src/main/webapp/app/config/error-middleware.ts.ejs b/generators/client/templates/react/src/main/webapp/app/config/error-middleware.ts.ejs index 45d6dd719c1d..a7470d24cafb 100644 --- a/generators/client/templates/react/src/main/webapp/app/config/error-middleware.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/config/error-middleware.ts.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/client/templates/react/src/main/webapp/app/config/icon-loader.ts.ejs b/generators/client/templates/react/src/main/webapp/app/config/icon-loader.ts.ejs index fede669c714a..3162fdbf0884 100644 --- a/generators/client/templates/react/src/main/webapp/app/config/icon-loader.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/config/icon-loader.ts.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/client/templates/react/src/main/webapp/app/config/logger-middleware.ts.ejs b/generators/client/templates/react/src/main/webapp/app/config/logger-middleware.ts.ejs index bcfda719732c..4bf731631c8c 100644 --- a/generators/client/templates/react/src/main/webapp/app/config/logger-middleware.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/config/logger-middleware.ts.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/client/templates/react/src/main/webapp/app/config/notification-middleware.ts.ejs b/generators/client/templates/react/src/main/webapp/app/config/notification-middleware.ts.ejs index 30a1c16b6e8c..c25a439c56d8 100644 --- a/generators/client/templates/react/src/main/webapp/app/config/notification-middleware.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/config/notification-middleware.ts.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/client/templates/react/src/main/webapp/app/config/store.ts.ejs b/generators/client/templates/react/src/main/webapp/app/config/store.ts.ejs index 12a0bba6b957..5b8d271db2d3 100644 --- a/generators/client/templates/react/src/main/webapp/app/config/store.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/config/store.ts.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/client/templates/react/src/main/webapp/app/config/translation.ts.ejs b/generators/client/templates/react/src/main/webapp/app/config/translation.ts.ejs index 9d1698f309a7..125430a4eb49 100644 --- a/generators/client/templates/react/src/main/webapp/app/config/translation.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/config/translation.ts.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/client/templates/react/src/main/webapp/app/config/websocket-middleware.ts.ejs b/generators/client/templates/react/src/main/webapp/app/config/websocket-middleware.ts.ejs index 0277d6845e1b..737527fb25fb 100644 --- a/generators/client/templates/react/src/main/webapp/app/config/websocket-middleware.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/config/websocket-middleware.ts.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/client/templates/react/src/main/webapp/app/entities/index.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/entities/index.tsx.ejs index 670176b6e9eb..7b0ac8a9312e 100644 --- a/generators/client/templates/react/src/main/webapp/app/entities/index.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/entities/index.tsx.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/client/templates/react/src/main/webapp/app/index.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/index.tsx.ejs index 437dd6377942..1168367f11ff 100644 --- a/generators/client/templates/react/src/main/webapp/app/index.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/index.tsx.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/client/templates/react/src/main/webapp/app/modules/account/activate/activate.reducer.ts.ejs b/generators/client/templates/react/src/main/webapp/app/modules/account/activate/activate.reducer.ts.ejs index c93552713aa0..2b70b7437a47 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/account/activate/activate.reducer.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/account/activate/activate.reducer.ts.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/client/templates/react/src/main/webapp/app/modules/account/activate/activate.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/account/activate/activate.tsx.ejs index cbb73d50007c..71ae7856652e 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/account/activate/activate.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/account/activate/activate.tsx.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/client/templates/react/src/main/webapp/app/modules/account/index.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/account/index.tsx.ejs index f78a68ef8770..3ed40dba7b04 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/account/index.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/account/index.tsx.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/client/templates/react/src/main/webapp/app/modules/account/password-reset/finish/password-reset-finish.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/account/password-reset/finish/password-reset-finish.tsx.ejs index 614ec530af06..c527c02038a5 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/account/password-reset/finish/password-reset-finish.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/account/password-reset/finish/password-reset-finish.tsx.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/client/templates/react/src/main/webapp/app/modules/account/password-reset/init/password-reset-init.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/account/password-reset/init/password-reset-init.tsx.ejs index 22bda5b16575..205ce6e11c78 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/account/password-reset/init/password-reset-init.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/account/password-reset/init/password-reset-init.tsx.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/client/templates/react/src/main/webapp/app/modules/account/password-reset/password-reset.reducer.ts.ejs b/generators/client/templates/react/src/main/webapp/app/modules/account/password-reset/password-reset.reducer.ts.ejs index f9fee0177441..fd1ef1883475 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/account/password-reset/password-reset.reducer.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/account/password-reset/password-reset.reducer.ts.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/client/templates/react/src/main/webapp/app/modules/account/password/password.reducer.ts.ejs b/generators/client/templates/react/src/main/webapp/app/modules/account/password/password.reducer.ts.ejs index 0d8cc99d77eb..2059ebc12687 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/account/password/password.reducer.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/account/password/password.reducer.ts.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/client/templates/react/src/main/webapp/app/modules/account/password/password.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/account/password/password.tsx.ejs index 5e147f468fff..82627526d027 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/account/password/password.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/account/password/password.tsx.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/client/templates/react/src/main/webapp/app/modules/account/register/register.reducer.ts.ejs b/generators/client/templates/react/src/main/webapp/app/modules/account/register/register.reducer.ts.ejs index 818a2b6f787d..48890759a640 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/account/register/register.reducer.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/account/register/register.reducer.ts.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/client/templates/react/src/main/webapp/app/modules/account/register/register.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/account/register/register.tsx.ejs index 813032d871d3..958b89655ca0 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/account/register/register.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/account/register/register.tsx.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/client/templates/react/src/main/webapp/app/modules/account/sessions/sessions.reducer.ts.ejs b/generators/client/templates/react/src/main/webapp/app/modules/account/sessions/sessions.reducer.ts.ejs index 8b7fc7dd79b8..f3da9a3f02d8 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/account/sessions/sessions.reducer.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/account/sessions/sessions.reducer.ts.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/client/templates/react/src/main/webapp/app/modules/account/sessions/sessions.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/account/sessions/sessions.tsx.ejs index 052cf43a02c1..846d76e42c49 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/account/sessions/sessions.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/account/sessions/sessions.tsx.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/client/templates/react/src/main/webapp/app/modules/account/settings/settings.reducer.ts.ejs b/generators/client/templates/react/src/main/webapp/app/modules/account/settings/settings.reducer.ts.ejs index 794037c29d05..ceff3e2cd025 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/account/settings/settings.reducer.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/account/settings/settings.reducer.ts.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/client/templates/react/src/main/webapp/app/modules/account/settings/settings.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/account/settings/settings.tsx.ejs index 87282026d5ea..a0103be165c0 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/account/settings/settings.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/account/settings/settings.tsx.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/client/templates/react/src/main/webapp/app/modules/administration/administration.reducer.ts.ejs b/generators/client/templates/react/src/main/webapp/app/modules/administration/administration.reducer.ts.ejs index 2f6b3a180641..08bf35c9d3ea 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/administration/administration.reducer.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/administration/administration.reducer.ts.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/client/templates/react/src/main/webapp/app/modules/administration/configuration/configuration.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/administration/configuration/configuration.tsx.ejs index 85b7a4e6b4b9..27023f6876a4 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/administration/configuration/configuration.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/administration/configuration/configuration.tsx.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/client/templates/react/src/main/webapp/app/modules/administration/docs/docs.scss.ejs b/generators/client/templates/react/src/main/webapp/app/modules/administration/docs/docs.scss.ejs index 473efca685fa..67c9c65fbef6 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/administration/docs/docs.scss.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/administration/docs/docs.scss.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/client/templates/react/src/main/webapp/app/modules/administration/docs/docs.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/administration/docs/docs.tsx.ejs index 73171aa5a0f9..7b0510abe488 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/administration/docs/docs.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/administration/docs/docs.tsx.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/client/templates/react/src/main/webapp/app/modules/administration/gateway/gateway.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/administration/gateway/gateway.tsx.ejs index 04e075e4c17d..0bb537e71bc6 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/administration/gateway/gateway.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/administration/gateway/gateway.tsx.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/client/templates/react/src/main/webapp/app/modules/administration/health/health-modal.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/administration/health/health-modal.tsx.ejs index 8b83377759d0..6e42a3602389 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/administration/health/health-modal.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/administration/health/health-modal.tsx.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/client/templates/react/src/main/webapp/app/modules/administration/health/health.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/administration/health/health.tsx.ejs index 6d3d6a141708..2de20ce92150 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/administration/health/health.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/administration/health/health.tsx.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/client/templates/react/src/main/webapp/app/modules/administration/index.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/administration/index.tsx.ejs index 3f0ec1e5403a..f3b9dbdf7440 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/administration/index.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/administration/index.tsx.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/client/templates/react/src/main/webapp/app/modules/administration/logs/logs.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/administration/logs/logs.tsx.ejs index 84916c4dd277..36ef9ad0570d 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/administration/logs/logs.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/administration/logs/logs.tsx.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/client/templates/react/src/main/webapp/app/modules/administration/metrics/metrics.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/administration/metrics/metrics.tsx.ejs index 66b6678758df..854575d43b01 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/administration/metrics/metrics.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/administration/metrics/metrics.tsx.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/client/templates/react/src/main/webapp/app/modules/administration/tracker/tracker.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/administration/tracker/tracker.tsx.ejs index 151048ea4c40..a22fe089dc92 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/administration/tracker/tracker.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/administration/tracker/tracker.tsx.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/client/templates/react/src/main/webapp/app/modules/administration/user-management/index.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/index.tsx.ejs index 92c7b19679dd..fa3f91002f19 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/index.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/index.tsx.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/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management-delete-dialog.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management-delete-dialog.tsx.ejs index 5b73ae04c4cb..f1d4e3bc9a8c 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management-delete-dialog.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management-delete-dialog.tsx.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/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management-detail.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management-detail.tsx.ejs index f384461fe38e..2699922e3902 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management-detail.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management-detail.tsx.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/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management-update.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management-update.tsx.ejs index fe870f047b03..fbe20780a717 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management-update.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management-update.tsx.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/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management.reducer.ts.ejs b/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management.reducer.ts.ejs index ec4e55faeb83..c8ffbf86c4f8 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management.reducer.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management.reducer.ts.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/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs index ca1c2789f4cd..22ff80867983 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/administration/user-management/user-management.tsx.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/client/templates/react/src/main/webapp/app/modules/home/home.scss.ejs b/generators/client/templates/react/src/main/webapp/app/modules/home/home.scss.ejs index 78344213b5fb..8c86bada0a22 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/home/home.scss.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/home/home.scss.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/client/templates/react/src/main/webapp/app/modules/home/home.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/home/home.tsx.ejs index 667f5d4ca6e2..72841a44ddc2 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/home/home.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/home/home.tsx.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/client/templates/react/src/main/webapp/app/modules/login/login-modal.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/login/login-modal.tsx.ejs index fd61c6089242..4e19ef753865 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/login/login-modal.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/login/login-modal.tsx.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/client/templates/react/src/main/webapp/app/modules/login/login.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/login/login.tsx.ejs index 592578b8698b..f7c91e30b8e7 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/login/login.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/login/login.tsx.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/client/templates/react/src/main/webapp/app/modules/login/logout.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/modules/login/logout.tsx.ejs index 63c4adb67ef5..88007ad40724 100644 --- a/generators/client/templates/react/src/main/webapp/app/modules/login/logout.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/modules/login/logout.tsx.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/client/templates/react/src/main/webapp/app/routes.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/routes.tsx.ejs index 81dc7ecaf658..eb496de821c0 100644 --- a/generators/client/templates/react/src/main/webapp/app/routes.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/routes.tsx.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/client/templates/react/src/main/webapp/app/shared/layout/footer/footer.scss.ejs b/generators/client/templates/react/src/main/webapp/app/shared/layout/footer/footer.scss.ejs index ec6e0e9a6fae..bbe08dbaa2a6 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/layout/footer/footer.scss.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/layout/footer/footer.scss.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/client/templates/react/src/main/webapp/app/shared/layout/footer/footer.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/shared/layout/footer/footer.tsx.ejs index 8d3a82b2cda4..f4aca6a6cbed 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/layout/footer/footer.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/layout/footer/footer.tsx.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/client/templates/react/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs index 252610d872f3..62ce2f0fb559 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header-components.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header-components.tsx.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/client/templates/react/src/main/webapp/app/shared/layout/header/header.scss.ejs b/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.scss.ejs index 132bc4934a98..6b5ece28d5c8 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.scss.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.scss.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/client/templates/react/src/main/webapp/app/shared/layout/header/header.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.tsx.ejs index cb46e9ef7495..50f82ab44bcd 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/layout/header/header.tsx.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/client/templates/react/src/main/webapp/app/shared/layout/menus/account.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/account.tsx.ejs index ec8c3b74b7d5..c4b4018b183c 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/account.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/account.tsx.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/client/templates/react/src/main/webapp/app/shared/layout/menus/admin.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/admin.tsx.ejs index 46c9baacded1..1a3d7e7dcf4c 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/admin.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/admin.tsx.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/client/templates/react/src/main/webapp/app/shared/layout/menus/entities.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/entities.tsx.ejs index 690690b57204..5c8017a7eb3d 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/entities.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/entities.tsx.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/client/templates/react/src/main/webapp/app/shared/layout/menus/index.ts.ejs b/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/index.ts.ejs index eded3d1cd73c..a95a1a6f2510 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/index.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/index.ts.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/client/templates/react/src/main/webapp/app/shared/layout/menus/locale.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/locale.tsx.ejs index de67ee21019e..b983828291d0 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/locale.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/locale.tsx.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/client/templates/react/src/main/webapp/app/shared/layout/menus/menu-components.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/menu-components.tsx.ejs index f0a78d3a0198..e5ba2930532f 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/menu-components.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/menu-components.tsx.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/client/templates/react/src/main/webapp/app/shared/layout/menus/menu-item.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/menu-item.tsx.ejs index 952b713b2dbb..35a67061d281 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/menu-item.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/layout/menus/menu-item.tsx.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/client/templates/react/src/main/webapp/app/shared/layout/password/password-strength-bar.scss.ejs b/generators/client/templates/react/src/main/webapp/app/shared/layout/password/password-strength-bar.scss.ejs index 134516b02178..12f41300a9bb 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/layout/password/password-strength-bar.scss.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/layout/password/password-strength-bar.scss.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/client/templates/react/src/main/webapp/app/shared/layout/password/password-strength-bar.tsx.ejs b/generators/client/templates/react/src/main/webapp/app/shared/layout/password/password-strength-bar.tsx.ejs index ce59fc8e4e58..2e1eb3d41ee0 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/layout/password/password-strength-bar.tsx.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/layout/password/password-strength-bar.tsx.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/client/templates/react/src/main/webapp/app/shared/model/user.model.ts.ejs b/generators/client/templates/react/src/main/webapp/app/shared/model/user.model.ts.ejs index 6f76f1af23ec..ed3b3b915e0c 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/model/user.model.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/model/user.model.ts.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/client/templates/react/src/main/webapp/app/shared/reducers/action-type.util.ts.ejs b/generators/client/templates/react/src/main/webapp/app/shared/reducers/action-type.util.ts.ejs index ac261d3e0306..c6d3a67b8dab 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/reducers/action-type.util.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/reducers/action-type.util.ts.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/client/templates/react/src/main/webapp/app/shared/reducers/application-profile.ts.ejs b/generators/client/templates/react/src/main/webapp/app/shared/reducers/application-profile.ts.ejs index 987947847c97..4c49ce92a5f9 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/reducers/application-profile.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/reducers/application-profile.ts.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/client/templates/react/src/main/webapp/app/shared/reducers/authentication.ts.ejs b/generators/client/templates/react/src/main/webapp/app/shared/reducers/authentication.ts.ejs index ee0e95ae1526..49fccfe26763 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/reducers/authentication.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/reducers/authentication.ts.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/client/templates/react/src/main/webapp/app/shared/reducers/index.ts.ejs b/generators/client/templates/react/src/main/webapp/app/shared/reducers/index.ts.ejs index 449f8ec87908..11ac338fdd1f 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/reducers/index.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/reducers/index.ts.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/client/templates/react/src/main/webapp/app/shared/reducers/locale.ts.ejs b/generators/client/templates/react/src/main/webapp/app/shared/reducers/locale.ts.ejs index f88a42b2d65f..fc889b9abdc6 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/reducers/locale.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/reducers/locale.ts.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/client/templates/react/src/main/webapp/app/shared/reducers/user-management.ts.ejs b/generators/client/templates/react/src/main/webapp/app/shared/reducers/user-management.ts.ejs index 3cfd6c4f2383..a242d0686659 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/reducers/user-management.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/reducers/user-management.ts.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/client/templates/react/src/main/webapp/app/shared/util/cookie-utils.ts.ejs b/generators/client/templates/react/src/main/webapp/app/shared/util/cookie-utils.ts.ejs index 11fc5470564b..53459b3f1aed 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/util/cookie-utils.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/util/cookie-utils.ts.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/client/templates/react/src/main/webapp/app/shared/util/date-utils.ts.ejs b/generators/client/templates/react/src/main/webapp/app/shared/util/date-utils.ts.ejs index 4d967fbfb8fa..03b614fb9bd6 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/util/date-utils.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/util/date-utils.ts.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/client/templates/react/src/main/webapp/app/shared/util/entity-utils.ts.ejs b/generators/client/templates/react/src/main/webapp/app/shared/util/entity-utils.ts.ejs index c27da3ad5619..2958031b49af 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/util/entity-utils.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/util/entity-utils.ts.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/client/templates/react/src/main/webapp/app/shared/util/pagination.constants.ts.ejs b/generators/client/templates/react/src/main/webapp/app/shared/util/pagination.constants.ts.ejs index 0e51f22a9877..27adda831e5a 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/util/pagination.constants.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/util/pagination.constants.ts.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/client/templates/react/src/main/webapp/app/shared/util/url-utils.ts.ejs b/generators/client/templates/react/src/main/webapp/app/shared/util/url-utils.ts.ejs index 13a4295371b7..028a294f9a04 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/util/url-utils.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/util/url-utils.ts.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/client/templates/react/src/main/webapp/app/typings.d.ts.ejs b/generators/client/templates/react/src/main/webapp/app/typings.d.ts.ejs index 34edc5a346d6..77174cefcd82 100644 --- a/generators/client/templates/react/src/main/webapp/app/typings.d.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/typings.d.ts.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/client/templates/react/src/main/webapp/index.html.ejs b/generators/client/templates/react/src/main/webapp/index.html.ejs index 8146360018b4..b438c50cdb82 100644 --- a/generators/client/templates/react/src/main/webapp/index.html.ejs +++ b/generators/client/templates/react/src/main/webapp/index.html.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/client/templates/react/src/main/webapp/robots.txt.ejs b/generators/client/templates/react/src/main/webapp/robots.txt.ejs index 0400819541fd..a5a57657c0f2 100644 --- a/generators/client/templates/react/src/main/webapp/robots.txt.ejs +++ b/generators/client/templates/react/src/main/webapp/robots.txt.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/client/templates/react/src/main/webapp/swagger-ui/index.html.ejs b/generators/client/templates/react/src/main/webapp/swagger-ui/index.html.ejs index 00c4c972d7db..f8f954864392 100644 --- a/generators/client/templates/react/src/main/webapp/swagger-ui/index.html.ejs +++ b/generators/client/templates/react/src/main/webapp/swagger-ui/index.html.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/client/templates/react/src/test/javascript/e2e/modules/account/account.spec.ts.ejs b/generators/client/templates/react/src/test/javascript/e2e/modules/account/account.spec.ts.ejs index b9e450f6e0bb..2978fd397311 100644 --- a/generators/client/templates/react/src/test/javascript/e2e/modules/account/account.spec.ts.ejs +++ b/generators/client/templates/react/src/test/javascript/e2e/modules/account/account.spec.ts.ejs @@ -1,20 +1,20 @@ <%# -Copyright 2013-2020 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. -This file is part of the JHipster project, see https://www.jhipster.tech/ -for more information. + 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"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + 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, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -%> import { browser, element, by } from 'protractor'; diff --git a/generators/client/templates/react/src/test/javascript/e2e/modules/administration/administration.spec.ts.ejs b/generators/client/templates/react/src/test/javascript/e2e/modules/administration/administration.spec.ts.ejs index 2aeefab56edc..288ece010dbc 100644 --- a/generators/client/templates/react/src/test/javascript/e2e/modules/administration/administration.spec.ts.ejs +++ b/generators/client/templates/react/src/test/javascript/e2e/modules/administration/administration.spec.ts.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/client/templates/react/src/test/javascript/protractor.conf.js.ejs b/generators/client/templates/react/src/test/javascript/protractor.conf.js.ejs index 83ffc6b17ee6..f40c900d5844 100644 --- a/generators/client/templates/react/src/test/javascript/protractor.conf.js.ejs +++ b/generators/client/templates/react/src/test/javascript/protractor.conf.js.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/client/templates/react/src/test/javascript/spec/app/config/axios-interceptor.spec.ts.ejs b/generators/client/templates/react/src/test/javascript/spec/app/config/axios-interceptor.spec.ts.ejs index 607749f3fa1e..4cfd927e2f53 100644 --- a/generators/client/templates/react/src/test/javascript/spec/app/config/axios-interceptor.spec.ts.ejs +++ b/generators/client/templates/react/src/test/javascript/spec/app/config/axios-interceptor.spec.ts.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/client/templates/react/src/test/javascript/spec/app/config/notification-middleware.spec.ts.ejs b/generators/client/templates/react/src/test/javascript/spec/app/config/notification-middleware.spec.ts.ejs index b718f4958219..62742bdb3c06 100644 --- a/generators/client/templates/react/src/test/javascript/spec/app/config/notification-middleware.spec.ts.ejs +++ b/generators/client/templates/react/src/test/javascript/spec/app/config/notification-middleware.spec.ts.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/client/templates/react/src/test/javascript/spec/app/modules/account/activate/activate.reducer.spec.ts.ejs b/generators/client/templates/react/src/test/javascript/spec/app/modules/account/activate/activate.reducer.spec.ts.ejs index 855ed3f9087f..8a6d87df33d3 100644 --- a/generators/client/templates/react/src/test/javascript/spec/app/modules/account/activate/activate.reducer.spec.ts.ejs +++ b/generators/client/templates/react/src/test/javascript/spec/app/modules/account/activate/activate.reducer.spec.ts.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/client/templates/react/src/test/javascript/spec/app/modules/account/password/password.reducer.spec.ts.ejs b/generators/client/templates/react/src/test/javascript/spec/app/modules/account/password/password.reducer.spec.ts.ejs index 22e86acb72a4..033adcd17731 100644 --- a/generators/client/templates/react/src/test/javascript/spec/app/modules/account/password/password.reducer.spec.ts.ejs +++ b/generators/client/templates/react/src/test/javascript/spec/app/modules/account/password/password.reducer.spec.ts.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/client/templates/react/src/test/javascript/spec/app/modules/account/register/register.reducer.spec.ts.ejs b/generators/client/templates/react/src/test/javascript/spec/app/modules/account/register/register.reducer.spec.ts.ejs index 9ed816374651..4365d035f54d 100644 --- a/generators/client/templates/react/src/test/javascript/spec/app/modules/account/register/register.reducer.spec.ts.ejs +++ b/generators/client/templates/react/src/test/javascript/spec/app/modules/account/register/register.reducer.spec.ts.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/client/templates/react/src/test/javascript/spec/app/modules/account/register/register.spec.tsx.ejs b/generators/client/templates/react/src/test/javascript/spec/app/modules/account/register/register.spec.tsx.ejs index 0fdccda33717..52743c658cd2 100644 --- a/generators/client/templates/react/src/test/javascript/spec/app/modules/account/register/register.spec.tsx.ejs +++ b/generators/client/templates/react/src/test/javascript/spec/app/modules/account/register/register.spec.tsx.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/client/templates/react/src/test/javascript/spec/app/modules/account/settings/settings.reducer.spec.ts.ejs b/generators/client/templates/react/src/test/javascript/spec/app/modules/account/settings/settings.reducer.spec.ts.ejs index 25fad5bdde06..45097febc099 100644 --- a/generators/client/templates/react/src/test/javascript/spec/app/modules/account/settings/settings.reducer.spec.ts.ejs +++ b/generators/client/templates/react/src/test/javascript/spec/app/modules/account/settings/settings.reducer.spec.ts.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/client/templates/react/src/test/javascript/spec/app/modules/administration/administration.reducer.spec.ts.ejs b/generators/client/templates/react/src/test/javascript/spec/app/modules/administration/administration.reducer.spec.ts.ejs index 92461a27c3d7..aaed28201eb3 100644 --- a/generators/client/templates/react/src/test/javascript/spec/app/modules/administration/administration.reducer.spec.ts.ejs +++ b/generators/client/templates/react/src/test/javascript/spec/app/modules/administration/administration.reducer.spec.ts.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/client/templates/react/src/test/javascript/spec/app/modules/administration/user-management/user-management.reducer.spec.ts.ejs b/generators/client/templates/react/src/test/javascript/spec/app/modules/administration/user-management/user-management.reducer.spec.ts.ejs index 06b75b27b995..bce8dcd2a64c 100644 --- a/generators/client/templates/react/src/test/javascript/spec/app/modules/administration/user-management/user-management.reducer.spec.ts.ejs +++ b/generators/client/templates/react/src/test/javascript/spec/app/modules/administration/user-management/user-management.reducer.spec.ts.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/client/templates/react/src/test/javascript/spec/app/shared/layout/header/header.spec.tsx.ejs b/generators/client/templates/react/src/test/javascript/spec/app/shared/layout/header/header.spec.tsx.ejs index e01edf576fc2..da2eaf04df29 100644 --- a/generators/client/templates/react/src/test/javascript/spec/app/shared/layout/header/header.spec.tsx.ejs +++ b/generators/client/templates/react/src/test/javascript/spec/app/shared/layout/header/header.spec.tsx.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/client/templates/react/src/test/javascript/spec/app/shared/layout/menus/account.spec.tsx.ejs b/generators/client/templates/react/src/test/javascript/spec/app/shared/layout/menus/account.spec.tsx.ejs index d5f03d38d3ad..244f5ff8284a 100644 --- a/generators/client/templates/react/src/test/javascript/spec/app/shared/layout/menus/account.spec.tsx.ejs +++ b/generators/client/templates/react/src/test/javascript/spec/app/shared/layout/menus/account.spec.tsx.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/client/templates/react/src/test/javascript/spec/app/shared/reducers/application-profile.spec.ts.ejs b/generators/client/templates/react/src/test/javascript/spec/app/shared/reducers/application-profile.spec.ts.ejs index 86a2537e91aa..8b72670dd9c7 100644 --- a/generators/client/templates/react/src/test/javascript/spec/app/shared/reducers/application-profile.spec.ts.ejs +++ b/generators/client/templates/react/src/test/javascript/spec/app/shared/reducers/application-profile.spec.ts.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/client/templates/react/src/test/javascript/spec/app/shared/reducers/authentication.spec.ts.ejs b/generators/client/templates/react/src/test/javascript/spec/app/shared/reducers/authentication.spec.ts.ejs index aeaf4a91085f..b95b1d40df84 100644 --- a/generators/client/templates/react/src/test/javascript/spec/app/shared/reducers/authentication.spec.ts.ejs +++ b/generators/client/templates/react/src/test/javascript/spec/app/shared/reducers/authentication.spec.ts.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/client/templates/react/src/test/javascript/spec/app/shared/reducers/user-management.spec.ts.ejs b/generators/client/templates/react/src/test/javascript/spec/app/shared/reducers/user-management.spec.ts.ejs index 9a3988bddf51..2c6be691f0a0 100644 --- a/generators/client/templates/react/src/test/javascript/spec/app/shared/reducers/user-management.spec.ts.ejs +++ b/generators/client/templates/react/src/test/javascript/spec/app/shared/reducers/user-management.spec.ts.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/client/templates/react/src/test/javascript/spec/app/shared/util/entity-utils.spec.ts.ejs b/generators/client/templates/react/src/test/javascript/spec/app/shared/util/entity-utils.spec.ts.ejs index 8661c3e36656..1dfdd6eb20e3 100644 --- a/generators/client/templates/react/src/test/javascript/spec/app/shared/util/entity-utils.spec.ts.ejs +++ b/generators/client/templates/react/src/test/javascript/spec/app/shared/util/entity-utils.spec.ts.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/client/templates/react/src/test/javascript/spec/app/utils.ts.ejs b/generators/client/templates/react/src/test/javascript/spec/app/utils.ts.ejs index f5eec042aebf..ea1bcddf2c0e 100644 --- a/generators/client/templates/react/src/test/javascript/spec/app/utils.ts.ejs +++ b/generators/client/templates/react/src/test/javascript/spec/app/utils.ts.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/client/templates/react/tsconfig.e2e.json.ejs b/generators/client/templates/react/tsconfig.e2e.json.ejs index 404fe749ce86..02306c5d836d 100644 --- a/generators/client/templates/react/tsconfig.e2e.json.ejs +++ b/generators/client/templates/react/tsconfig.e2e.json.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/client/templates/react/tsconfig.json.ejs b/generators/client/templates/react/tsconfig.json.ejs index 51c632f40ffc..8649b81ae665 100644 --- a/generators/client/templates/react/tsconfig.json.ejs +++ b/generators/client/templates/react/tsconfig.json.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/client/templates/react/tsconfig.test.json.ejs b/generators/client/templates/react/tsconfig.test.json.ejs index 40f89305178a..300cc1b2a52a 100644 --- a/generators/client/templates/react/tsconfig.test.json.ejs +++ b/generators/client/templates/react/tsconfig.test.json.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/client/templates/react/webpack/utils.js.ejs b/generators/client/templates/react/webpack/utils.js.ejs index d9f6f9694d89..9eadd68cadf7 100644 --- a/generators/client/templates/react/webpack/utils.js.ejs +++ b/generators/client/templates/react/webpack/utils.js.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/client/templates/react/webpack/webpack.common.js.ejs b/generators/client/templates/react/webpack/webpack.common.js.ejs index 5d8ac890d1d6..5e81a338b5cb 100644 --- a/generators/client/templates/react/webpack/webpack.common.js.ejs +++ b/generators/client/templates/react/webpack/webpack.common.js.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/client/templates/react/webpack/webpack.dev.js.ejs b/generators/client/templates/react/webpack/webpack.dev.js.ejs index 8d2f80142c10..99a5ec67c5ec 100644 --- a/generators/client/templates/react/webpack/webpack.dev.js.ejs +++ b/generators/client/templates/react/webpack/webpack.dev.js.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/client/templates/react/webpack/webpack.prod.js.ejs b/generators/client/templates/react/webpack/webpack.prod.js.ejs index d917bc49b481..2840bc8469f8 100644 --- a/generators/client/templates/react/webpack/webpack.prod.js.ejs +++ b/generators/client/templates/react/webpack/webpack.prod.js.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/client/templates/vue/.eslintrc.js.ejs b/generators/client/templates/vue/.eslintrc.js.ejs index 52590d6974d6..cb6fc4d2aee1 100644 --- a/generators/client/templates/vue/.eslintrc.js.ejs +++ b/generators/client/templates/vue/.eslintrc.js.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/client/templates/vue/package.json.ejs b/generators/client/templates/vue/package.json.ejs index c9fc08b147d0..7d0e9fe3c83f 100644 --- a/generators/client/templates/vue/package.json.ejs +++ b/generators/client/templates/vue/package.json.ejs @@ -1,20 +1,20 @@ <%# -Copyright 2013-2020 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. -This file is part of the JHipster project, see https://www.jhipster.tech/ -for more information. + 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"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + 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, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -%> { "name": "<%= dasherizedBaseName %>", diff --git a/generators/client/templates/vue/src/main/webapp/404.html.ejs b/generators/client/templates/vue/src/main/webapp/404.html.ejs index 2ff56fc91bd6..6965725a6209 100644 --- a/generators/client/templates/vue/src/main/webapp/404.html.ejs +++ b/generators/client/templates/vue/src/main/webapp/404.html.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/client/templates/vue/src/main/webapp/app/shared/config/axios-interceptor.ts.ejs b/generators/client/templates/vue/src/main/webapp/app/shared/config/axios-interceptor.ts.ejs index b37d26cab1ff..df3f3618acae 100644 --- a/generators/client/templates/vue/src/main/webapp/app/shared/config/axios-interceptor.ts.ejs +++ b/generators/client/templates/vue/src/main/webapp/app/shared/config/axios-interceptor.ts.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/client/templates/vue/src/main/webapp/app/shared/data/data-utils.service.ts.ejs b/generators/client/templates/vue/src/main/webapp/app/shared/data/data-utils.service.ts.ejs index cab6d1dc1c75..ad2cd3208e7c 100644 --- a/generators/client/templates/vue/src/main/webapp/app/shared/data/data-utils.service.ts.ejs +++ b/generators/client/templates/vue/src/main/webapp/app/shared/data/data-utils.service.ts.ejs @@ -1,17 +1,21 @@ -/* -Copyright 2013-2020 the original author or authors from the JHipster project. -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 "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 -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ +<%# + Copyright 2013-2020 the original author or authors from the JHipster project. + + 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"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + 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, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-%> import { Component, Vue } from 'vue-property-decorator'; /** diff --git a/generators/client/templates/vue/src/main/webapp/content/css/global.css.ejs b/generators/client/templates/vue/src/main/webapp/content/css/global.css.ejs index 9d3f0ffb1b4f..6df3d8151bef 100644 --- a/generators/client/templates/vue/src/main/webapp/content/css/global.css.ejs +++ b/generators/client/templates/vue/src/main/webapp/content/css/global.css.ejs @@ -1,17 +1,20 @@ -<%#Copyright 2013-2020 the original author or authors from the JHipster project. +<%# + Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://www.jhipster.tech/ for - more information. Licensed under the Apache License, - Version 2 (the "License"); -youmay not use this file except in compliance with the License. + 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"); + 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 Unless - required by applicable law or agreed to in writing, - software distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific language - governing permissions and limitations under the License. + 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, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -%> /* ============================================================== Bootstrap tweaks diff --git a/generators/client/templates/vue/src/main/webapp/content/css/rtl.css.ejs b/generators/client/templates/vue/src/main/webapp/content/css/rtl.css.ejs index 3bc139340110..5a34c668bfc7 100644 --- a/generators/client/templates/vue/src/main/webapp/content/css/rtl.css.ejs +++ b/generators/client/templates/vue/src/main/webapp/content/css/rtl.css.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/client/templates/vue/src/main/webapp/content/css/vendor.css.ejs b/generators/client/templates/vue/src/main/webapp/content/css/vendor.css.ejs index 5717f8786035..15a46658e565 100644 --- a/generators/client/templates/vue/src/main/webapp/content/css/vendor.css.ejs +++ b/generators/client/templates/vue/src/main/webapp/content/css/vendor.css.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/client/templates/vue/src/main/webapp/content/scss/global.scss.ejs b/generators/client/templates/vue/src/main/webapp/content/scss/global.scss.ejs index 241191ef10e4..da581bae760a 100644 --- a/generators/client/templates/vue/src/main/webapp/content/scss/global.scss.ejs +++ b/generators/client/templates/vue/src/main/webapp/content/scss/global.scss.ejs @@ -1,17 +1,20 @@ -<%#Copyright 2013-2020 the original author or authors from the JHipster project. +<%# + Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://www.jhipster.tech/ for - more information. Licensed under the Apache License, - Version 2 (the "License"); -youmay not use this file except in compliance with the License. + 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"); + 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 Unless - required by applicable law or agreed to in writing, - software distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific language - governing permissions and limitations under the License. + 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, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -%> @import "bootstrap-variables"; diff --git a/generators/client/templates/vue/src/main/webapp/content/scss/vendor.scss.ejs b/generators/client/templates/vue/src/main/webapp/content/scss/vendor.scss.ejs index 4776f85c0cf6..9281382fef58 100644 --- a/generators/client/templates/vue/src/main/webapp/content/scss/vendor.scss.ejs +++ b/generators/client/templates/vue/src/main/webapp/content/scss/vendor.scss.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/client/templates/vue/src/main/webapp/robots.txt.ejs b/generators/client/templates/vue/src/main/webapp/robots.txt.ejs index 0400819541fd..a5a57657c0f2 100644 --- a/generators/client/templates/vue/src/main/webapp/robots.txt.ejs +++ b/generators/client/templates/vue/src/main/webapp/robots.txt.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/client/templates/vue/src/main/webapp/swagger-ui/index.html.ejs b/generators/client/templates/vue/src/main/webapp/swagger-ui/index.html.ejs index 72ca85481b72..15407132a217 100644 --- a/generators/client/templates/vue/src/main/webapp/swagger-ui/index.html.ejs +++ b/generators/client/templates/vue/src/main/webapp/swagger-ui/index.html.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/client/templates/vue/webpack/utils.js.ejs b/generators/client/templates/vue/webpack/utils.js.ejs index 1c4070a18d90..1ee5d43e05ff 100644 --- a/generators/client/templates/vue/webpack/utils.js.ejs +++ b/generators/client/templates/vue/webpack/utils.js.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/cloudfoundry/index.js b/generators/cloudfoundry/index.js index 7426498b3ce6..c07477ed59ba 100644 --- a/generators/cloudfoundry/index.js +++ b/generators/cloudfoundry/index.js @@ -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/cloudfoundry/prompts.js b/generators/cloudfoundry/prompts.js index e026f8f6da06..909b282e08e5 100644 --- a/generators/cloudfoundry/prompts.js +++ b/generators/cloudfoundry/prompts.js @@ -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/cloudfoundry/templates/application-cloudfoundry.yml.ejs b/generators/cloudfoundry/templates/application-cloudfoundry.yml.ejs index 9e0d009bdc16..5da7ae748e0e 100644 --- a/generators/cloudfoundry/templates/application-cloudfoundry.yml.ejs +++ b/generators/cloudfoundry/templates/application-cloudfoundry.yml.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/cloudfoundry/templates/manifest.yml.ejs b/generators/cloudfoundry/templates/manifest.yml.ejs index 1c786024fb0e..128a478ab8e3 100644 --- a/generators/cloudfoundry/templates/manifest.yml.ejs +++ b/generators/cloudfoundry/templates/manifest.yml.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/common/files.js b/generators/common/files.js index feca10703853..f017601b143a 100644 --- a/generators/common/files.js +++ b/generators/common/files.js @@ -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/common/index.js b/generators/common/index.js index 258e2fc13824..e64bbc8b4e4d 100644 --- a/generators/common/index.js +++ b/generators/common/index.js @@ -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/common/templates/.huskyrc.ejs b/generators/common/templates/.huskyrc.ejs index 7344a7b22717..01415b49ee97 100644 --- a/generators/common/templates/.huskyrc.ejs +++ b/generators/common/templates/.huskyrc.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/common/templates/.lintstagedrc.js.ejs b/generators/common/templates/.lintstagedrc.js.ejs index 756de2c86177..81172a9eb7bb 100644 --- a/generators/common/templates/.lintstagedrc.js.ejs +++ b/generators/common/templates/.lintstagedrc.js.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/common/templates/README.md.ejs b/generators/common/templates/README.md.ejs index 199f6d3ea605..f93c2139632d 100644 --- a/generators/common/templates/README.md.ejs +++ b/generators/common/templates/README.md.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/cypress/files.js b/generators/cypress/files.js index 57360cec6220..faf716d765fa 100644 --- a/generators/cypress/files.js +++ b/generators/cypress/files.js @@ -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/cypress/index.js b/generators/cypress/index.js index e79f6a0eca12..96fc0c499ab0 100644 --- a/generators/cypress/index.js +++ b/generators/cypress/index.js @@ -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/database-changelog-liquibase/files.js b/generators/database-changelog-liquibase/files.js index 02172c97ddaf..e6dd600583ad 100644 --- a/generators/database-changelog-liquibase/files.js +++ b/generators/database-changelog-liquibase/files.js @@ -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/database-changelog-liquibase/index.js b/generators/database-changelog-liquibase/index.js index 8d1d06b64ebc..bce7bc446dc0 100644 --- a/generators/database-changelog-liquibase/index.js +++ b/generators/database-changelog-liquibase/index.js @@ -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/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity.xml.ejs b/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity.xml.ejs index 95a47da64db9..520f64852974 100644 --- a/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity.xml.ejs +++ b/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity.xml.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/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity_constraints.xml.ejs b/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity_constraints.xml.ejs index a4db463bc6cd..4b92035a0677 100644 --- a/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity_constraints.xml.ejs +++ b/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity_constraints.xml.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/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity.xml.ejs b/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity.xml.ejs index 7deebcff102e..7c21bf6e99d9 100644 --- a/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity.xml.ejs +++ b/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity.xml.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/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs b/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs index dd1b0d00dd56..c13fb0e9d430 100644 --- a/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs +++ b/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.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/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_migrate.xml.ejs b/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_migrate.xml.ejs index 61f1cb5ebe1b..4bef50a4da95 100644 --- a/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_migrate.xml.ejs +++ b/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_migrate.xml.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/database-changelog-liquibase/templates/src/main/resources/config/liquibase/fake-data/table_entity.csv.ejs b/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/fake-data/table_entity.csv.ejs index 082bec93cba5..b4ca42c5d697 100644 --- a/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/fake-data/table_entity.csv.ejs +++ b/generators/database-changelog-liquibase/templates/src/main/resources/config/liquibase/fake-data/table_entity.csv.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/database-changelog/index.js b/generators/database-changelog/index.js index a152f0bcd6ad..db7b56880158 100644 --- a/generators/database-changelog/index.js +++ b/generators/database-changelog/index.js @@ -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/docker-base.js b/generators/docker-base.js index 42b48bb0a33a..92021846cffa 100644 --- a/generators/docker-base.js +++ b/generators/docker-base.js @@ -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/docker-cli.js b/generators/docker-cli.js index bee354dc0123..67a445e9a3a4 100644 --- a/generators/docker-cli.js +++ b/generators/docker-cli.js @@ -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/docker-compose/files.js b/generators/docker-compose/files.js index 80f38daf80ef..3ade1cd1a895 100644 --- a/generators/docker-compose/files.js +++ b/generators/docker-compose/files.js @@ -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/docker-compose/index.js b/generators/docker-compose/index.js index 08b2625178aa..c7ae8998e250 100644 --- a/generators/docker-compose/index.js +++ b/generators/docker-compose/index.js @@ -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/docker-compose/templates/alertmanager-conf/config.yml.ejs b/generators/docker-compose/templates/alertmanager-conf/config.yml.ejs index 7a1802777ee9..4ee12fe5196d 100644 --- a/generators/docker-compose/templates/alertmanager-conf/config.yml.ejs +++ b/generators/docker-compose/templates/alertmanager-conf/config.yml.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/docker-compose/templates/central-server-config/application.yml.ejs b/generators/docker-compose/templates/central-server-config/application.yml.ejs index 273a43efb958..4860ade01cd0 100644 --- a/generators/docker-compose/templates/central-server-config/application.yml.ejs +++ b/generators/docker-compose/templates/central-server-config/application.yml.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/docker-compose/templates/docker-compose.yml.ejs b/generators/docker-compose/templates/docker-compose.yml.ejs index 360ae1472b67..bb4c3e923af5 100644 --- a/generators/docker-compose/templates/docker-compose.yml.ejs +++ b/generators/docker-compose/templates/docker-compose.yml.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/docker-compose/templates/log-data/.gitignore.ejs b/generators/docker-compose/templates/log-data/.gitignore.ejs index 3771f77f531e..91fd46345ac0 100644 --- a/generators/docker-compose/templates/log-data/.gitignore.ejs +++ b/generators/docker-compose/templates/log-data/.gitignore.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/docker-compose/templates/prometheus-conf/alert_rules.yml.ejs b/generators/docker-compose/templates/prometheus-conf/alert_rules.yml.ejs index 5ade73c19d47..032c1327cee6 100644 --- a/generators/docker-compose/templates/prometheus-conf/alert_rules.yml.ejs +++ b/generators/docker-compose/templates/prometheus-conf/alert_rules.yml.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/docker-compose/templates/prometheus-conf/prometheus.yml.ejs b/generators/docker-compose/templates/prometheus-conf/prometheus.yml.ejs index 6fbbe9642ab5..1f7be8469fbd 100644 --- a/generators/docker-compose/templates/prometheus-conf/prometheus.yml.ejs +++ b/generators/docker-compose/templates/prometheus-conf/prometheus.yml.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/docker-compose/templates/traefik/traefik.toml.ejs b/generators/docker-compose/templates/traefik/traefik.toml.ejs index e9c4dcb9ae2e..ed8cb0cad966 100644 --- a/generators/docker-compose/templates/traefik/traefik.toml.ejs +++ b/generators/docker-compose/templates/traefik/traefik.toml.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/docker-prompts.js b/generators/docker-prompts.js index fb7f3e4e6670..e707c13150ea 100644 --- a/generators/docker-prompts.js +++ b/generators/docker-prompts.js @@ -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/docker-utils.js b/generators/docker-utils.js index 636d56631ea2..de6977e05c5b 100644 --- a/generators/docker-utils.js +++ b/generators/docker-utils.js @@ -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/entities-client/index.js b/generators/entities-client/index.js index 938937b56787..cbf1fa80741b 100644 --- a/generators/entities-client/index.js +++ b/generators/entities-client/index.js @@ -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/entities/index.js b/generators/entities/index.js index ba2411e9d56f..45334af3d840 100644 --- a/generators/entities/index.js +++ b/generators/entities/index.js @@ -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/entity-client/files.js b/generators/entity-client/files.js index 6ea05fce7066..5008de380545 100644 --- a/generators/entity-client/files.js +++ b/generators/entity-client/files.js @@ -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/entity-client/index.js b/generators/entity-client/index.js index 87a4e7311595..87e685104449 100644 --- a/generators/entity-client/index.js +++ b/generators/entity-client/index.js @@ -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/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.html.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.html.ejs index 8dca114a097d..ee4c5add02b0 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.html.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.html.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/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs index 4e60c8896f47..4c23698c1534 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.spec.ts.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/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.ts.ejs index 2d8bfc193de9..180e34cba873 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.ts.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/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.html.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.html.ejs index 0d27a855249f..b51c3e5bc67b 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.html.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.html.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/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.spec.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.spec.ts.ejs index dca99564eb74..e1a792566ab6 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.spec.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.spec.ts.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/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.ts.ejs index 6d756a93c92e..559050d936f7 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.ts.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/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing-resolve.service.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing-resolve.service.ts.ejs index 108e2c3f9c87..a8cf091c69b9 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing-resolve.service.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing-resolve.service.ts.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/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs index 1003da7ff006..cd35e9582704 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.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/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.module.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.module.ts.ejs index 4ffb02fb5785..429f7f8f0ba8 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.module.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.module.ts.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/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.service.spec.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.service.spec.ts.ejs index 0d427dad0aa3..29023c59b250 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.service.spec.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management.service.spec.ts.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/entity-client/templates/angular/src/main/webapp/app/entities/entity.model.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity.model.ts.ejs index cd383a946668..c4c6318cb8e9 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity.model.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity.model.ts.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/entity-client/templates/angular/src/main/webapp/app/entities/entity.service.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity.service.ts.ejs index fa95d9ac1458..7e65f51b20ae 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity.service.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity.service.ts.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/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.html.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.html.ejs index e1c55875f04d..a837b7f5e425 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.html.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.html.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/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.spec.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.spec.ts.ejs index ddd6c8033788..06180d419962 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.spec.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.spec.ts.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/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.ts.ejs index e437b824c623..72b7bb74516e 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.ts.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/entity-client/templates/angular/src/main/webapp/app/entities/list/infinite-scroll-template.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/infinite-scroll-template.ejs index ad0eb12ac059..b35235de117e 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/infinite-scroll-template.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/infinite-scroll-template.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/entity-client/templates/angular/src/main/webapp/app/entities/list/no-pagination-template.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/no-pagination-template.ejs index e62630fe867a..de2e5cf3b0de 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/no-pagination-template.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/no-pagination-template.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/entity-client/templates/angular/src/main/webapp/app/entities/list/pagination-template.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/pagination-template.ejs index a8aac3157ce5..48514296744f 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/pagination-template.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/pagination-template.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/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.html.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.html.ejs index da3c1e7af7a6..7254bd71146e 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.html.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.html.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/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.spec.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.spec.ts.ejs index 3ce7c93b43d0..1ac5a8796fb0 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.spec.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.spec.ts.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/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.ejs index 11b5a3bea472..9211ba4ecb6b 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.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/entity-client/templates/angular/src/test/javascript/e2e/entities/entity-page-object.ts.ejs b/generators/entity-client/templates/angular/src/test/javascript/e2e/entities/entity-page-object.ts.ejs index 28cf53a35ae6..8b35d0ba40a9 100644 --- a/generators/entity-client/templates/angular/src/test/javascript/e2e/entities/entity-page-object.ts.ejs +++ b/generators/entity-client/templates/angular/src/test/javascript/e2e/entities/entity-page-object.ts.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/entity-client/templates/angular/src/test/javascript/e2e/entities/entity.spec.ts.ejs b/generators/entity-client/templates/angular/src/test/javascript/e2e/entities/entity.spec.ts.ejs index d75394fa9e43..ee28edf2abb5 100644 --- a/generators/entity-client/templates/angular/src/test/javascript/e2e/entities/entity.spec.ts.ejs +++ b/generators/entity-client/templates/angular/src/test/javascript/e2e/entities/entity.spec.ts.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/entity-client/templates/common/src/main/webapp/app/entities/enumerations/enum.model.ts.ejs b/generators/entity-client/templates/common/src/main/webapp/app/entities/enumerations/enum.model.ts.ejs index 7e8953372451..96d6edadc10a 100644 --- a/generators/entity-client/templates/common/src/main/webapp/app/entities/enumerations/enum.model.ts.ejs +++ b/generators/entity-client/templates/common/src/main/webapp/app/entities/enumerations/enum.model.ts.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/entity-client/templates/react/src/main/webapp/app/entities/entity-delete-dialog.tsx.ejs b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-delete-dialog.tsx.ejs index bb7d97bad6ca..16d4dcff6930 100644 --- a/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-delete-dialog.tsx.ejs +++ b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-delete-dialog.tsx.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/entity-client/templates/react/src/main/webapp/app/entities/entity-detail.tsx.ejs b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-detail.tsx.ejs index a1390aa57081..af913c8d376a 100644 --- a/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-detail.tsx.ejs +++ b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-detail.tsx.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/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs index 0881da6eb464..1bb4438e9a02 100644 --- a/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs +++ b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.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/entity-client/templates/react/src/main/webapp/app/entities/entity.model.ts.ejs b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.model.ts.ejs index 52b241619afd..cbcf116c40f3 100644 --- a/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.model.ts.ejs +++ b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.model.ts.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/entity-client/templates/react/src/main/webapp/app/entities/entity.reducer.ts.ejs b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.reducer.ts.ejs index e791e5aaca29..dc91fea5dd98 100644 --- a/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.reducer.ts.ejs +++ b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.reducer.ts.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/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs index 974ff74f6380..b9f810d5bd5e 100644 --- a/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.ejs +++ b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity.tsx.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/entity-client/templates/react/src/main/webapp/app/entities/index.tsx.ejs b/generators/entity-client/templates/react/src/main/webapp/app/entities/index.tsx.ejs index cf5fee4f3021..54bfe5ecad2e 100644 --- a/generators/entity-client/templates/react/src/main/webapp/app/entities/index.tsx.ejs +++ b/generators/entity-client/templates/react/src/main/webapp/app/entities/index.tsx.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/entity-client/templates/react/src/main/webapp/app/entities/react_validators.ejs b/generators/entity-client/templates/react/src/main/webapp/app/entities/react_validators.ejs index 1783b929a709..de2cb51273c9 100644 --- a/generators/entity-client/templates/react/src/main/webapp/app/entities/react_validators.ejs +++ b/generators/entity-client/templates/react/src/main/webapp/app/entities/react_validators.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/entity-client/templates/react/src/test/javascript/e2e/entities/entity-page-object.ts.ejs b/generators/entity-client/templates/react/src/test/javascript/e2e/entities/entity-page-object.ts.ejs index af2e5f8c4a06..18c0d995130d 100644 --- a/generators/entity-client/templates/react/src/test/javascript/e2e/entities/entity-page-object.ts.ejs +++ b/generators/entity-client/templates/react/src/test/javascript/e2e/entities/entity-page-object.ts.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/entity-client/templates/react/src/test/javascript/e2e/entities/entity-update-page-object.ts.ejs b/generators/entity-client/templates/react/src/test/javascript/e2e/entities/entity-update-page-object.ts.ejs index 6dce82b292a5..a26f317f9899 100644 --- a/generators/entity-client/templates/react/src/test/javascript/e2e/entities/entity-update-page-object.ts.ejs +++ b/generators/entity-client/templates/react/src/test/javascript/e2e/entities/entity-update-page-object.ts.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/entity-client/templates/react/src/test/javascript/e2e/entities/entity.spec.ts.ejs b/generators/entity-client/templates/react/src/test/javascript/e2e/entities/entity.spec.ts.ejs index 1d18e949300f..6a5451eea682 100644 --- a/generators/entity-client/templates/react/src/test/javascript/e2e/entities/entity.spec.ts.ejs +++ b/generators/entity-client/templates/react/src/test/javascript/e2e/entities/entity.spec.ts.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/entity-client/templates/react/src/test/javascript/spec/app/entities/entity-management-detail.spec.ts.ejs b/generators/entity-client/templates/react/src/test/javascript/spec/app/entities/entity-management-detail.spec.ts.ejs index 01a15983fce0..b095d59c373a 100644 --- a/generators/entity-client/templates/react/src/test/javascript/spec/app/entities/entity-management-detail.spec.ts.ejs +++ b/generators/entity-client/templates/react/src/test/javascript/spec/app/entities/entity-management-detail.spec.ts.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/entity-client/templates/react/src/test/javascript/spec/app/entities/entity-reducer.spec.ts.ejs b/generators/entity-client/templates/react/src/test/javascript/spec/app/entities/entity-reducer.spec.ts.ejs index f40fd837ca42..bc9b002998a5 100644 --- a/generators/entity-client/templates/react/src/test/javascript/spec/app/entities/entity-reducer.spec.ts.ejs +++ b/generators/entity-client/templates/react/src/test/javascript/spec/app/entities/entity-reducer.spec.ts.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/entity-client/templates/vue/src/main/webapp/app/entities/entity.model.ts.ejs b/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.model.ts.ejs index 11851971ff2e..e44dbd88adf7 100644 --- a/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.model.ts.ejs +++ b/generators/entity-client/templates/vue/src/main/webapp/app/entities/entity.model.ts.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/entity-client/templates/vue/src/test/javascript/e2e/entities/entity-details-page-object.ts.ejs b/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity-details-page-object.ts.ejs index 7cf37c7a983d..fd2ca4bc01f7 100644 --- a/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity-details-page-object.ts.ejs +++ b/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity-details-page-object.ts.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/entity-client/templates/vue/src/test/javascript/e2e/entities/entity-page-object.ts.ejs b/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity-page-object.ts.ejs index 978db1ce4be2..a15d4e71d36b 100644 --- a/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity-page-object.ts.ejs +++ b/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity-page-object.ts.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/entity-client/templates/vue/src/test/javascript/e2e/entities/entity-update-page-object.ts.ejs b/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity-update-page-object.ts.ejs index 384e2e2c2de6..ef59e6d62906 100644 --- a/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity-update-page-object.ts.ejs +++ b/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity-update-page-object.ts.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/entity-client/templates/vue/src/test/javascript/e2e/entities/entity.spec.ts.ejs b/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity.spec.ts.ejs index ccf7f350d35f..a3522cbffade 100644 --- a/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity.spec.ts.ejs +++ b/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity.spec.ts.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/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-details.component.spec.ts.ejs b/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-details.component.spec.ts.ejs index b87d44797b85..7776fbe60e46 100644 --- a/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-details.component.spec.ts.ejs +++ b/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-details.component.spec.ts.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/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-update.component.spec.ts.ejs b/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-update.component.spec.ts.ejs index 20f72016178f..79fb35138ca2 100644 --- a/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-update.component.spec.ts.ejs +++ b/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity-update.component.spec.ts.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/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.component.spec.ts.ejs b/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.component.spec.ts.ejs index c2da918eb790..59a97b4252d0 100644 --- a/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.component.spec.ts.ejs +++ b/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.component.spec.ts.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/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.service.spec.ts.ejs b/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.service.spec.ts.ejs index 53bb51bb10d0..20c9b961a10b 100644 --- a/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.service.spec.ts.ejs +++ b/generators/entity-client/templates/vue/src/test/javascript/spec/app/entities/entity.service.spec.ts.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/entity-i18n/files.js b/generators/entity-i18n/files.js index 62f8cc9fe357..0cfa806d43e6 100644 --- a/generators/entity-i18n/files.js +++ b/generators/entity-i18n/files.js @@ -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/entity-i18n/index.js b/generators/entity-i18n/index.js index cafbb803de06..1b6726773f4f 100644 --- a/generators/entity-i18n/index.js +++ b/generators/entity-i18n/index.js @@ -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/entity-i18n/templates/i18n/entity_al.json.ejs b/generators/entity-i18n/templates/i18n/entity_al.json.ejs index 7382b317c562..c91e2ef2b486 100644 --- a/generators/entity-i18n/templates/i18n/entity_al.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_al.json.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/entity-i18n/templates/i18n/entity_ar-ly.json.ejs b/generators/entity-i18n/templates/i18n/entity_ar-ly.json.ejs index 4f86992b8d2b..eed142560d84 100644 --- a/generators/entity-i18n/templates/i18n/entity_ar-ly.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_ar-ly.json.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/entity-i18n/templates/i18n/entity_bg.json.ejs b/generators/entity-i18n/templates/i18n/entity_bg.json.ejs index 2748235bd4de..1a98200253d9 100644 --- a/generators/entity-i18n/templates/i18n/entity_bg.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_bg.json.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/entity-i18n/templates/i18n/entity_bn.json.ejs b/generators/entity-i18n/templates/i18n/entity_bn.json.ejs index 4f86992b8d2b..eed142560d84 100644 --- a/generators/entity-i18n/templates/i18n/entity_bn.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_bn.json.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/entity-i18n/templates/i18n/entity_by.json.ejs b/generators/entity-i18n/templates/i18n/entity_by.json.ejs index 2b4c0d0dfd62..7bd560395628 100644 --- a/generators/entity-i18n/templates/i18n/entity_by.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_by.json.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/entity-i18n/templates/i18n/entity_ca.json.ejs b/generators/entity-i18n/templates/i18n/entity_ca.json.ejs index 4f86992b8d2b..eed142560d84 100644 --- a/generators/entity-i18n/templates/i18n/entity_ca.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_ca.json.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/entity-i18n/templates/i18n/entity_cs.json.ejs b/generators/entity-i18n/templates/i18n/entity_cs.json.ejs index 4db6bbf14561..07e1840076fc 100644 --- a/generators/entity-i18n/templates/i18n/entity_cs.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_cs.json.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/entity-i18n/templates/i18n/entity_da.json.ejs b/generators/entity-i18n/templates/i18n/entity_da.json.ejs index 4f86992b8d2b..eed142560d84 100644 --- a/generators/entity-i18n/templates/i18n/entity_da.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_da.json.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/entity-i18n/templates/i18n/entity_de.json.ejs b/generators/entity-i18n/templates/i18n/entity_de.json.ejs index 9af0b93454de..41faee9e25c7 100644 --- a/generators/entity-i18n/templates/i18n/entity_de.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_de.json.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/entity-i18n/templates/i18n/entity_el.json.ejs b/generators/entity-i18n/templates/i18n/entity_el.json.ejs index cb169ad7cdea..d802a584e55c 100644 --- a/generators/entity-i18n/templates/i18n/entity_el.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_el.json.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/entity-i18n/templates/i18n/entity_en.json.ejs b/generators/entity-i18n/templates/i18n/entity_en.json.ejs index 70c97e7ef7b2..ce79346133fe 100644 --- a/generators/entity-i18n/templates/i18n/entity_en.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_en.json.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/entity-i18n/templates/i18n/entity_es.json.ejs b/generators/entity-i18n/templates/i18n/entity_es.json.ejs index 2a2a3a9fba82..6ec2c8359df5 100644 --- a/generators/entity-i18n/templates/i18n/entity_es.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_es.json.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/entity-i18n/templates/i18n/entity_et.json.ejs b/generators/entity-i18n/templates/i18n/entity_et.json.ejs index 099ed25a14e9..b8e40358af5b 100644 --- a/generators/entity-i18n/templates/i18n/entity_et.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_et.json.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/entity-i18n/templates/i18n/entity_fa.json.ejs b/generators/entity-i18n/templates/i18n/entity_fa.json.ejs index 4f86992b8d2b..eed142560d84 100644 --- a/generators/entity-i18n/templates/i18n/entity_fa.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_fa.json.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/entity-i18n/templates/i18n/entity_fi.json.ejs b/generators/entity-i18n/templates/i18n/entity_fi.json.ejs index 66469ef0a024..0e4187aee2db 100644 --- a/generators/entity-i18n/templates/i18n/entity_fi.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_fi.json.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/entity-i18n/templates/i18n/entity_fr.json.ejs b/generators/entity-i18n/templates/i18n/entity_fr.json.ejs index 3b108e51ab5b..a0fc5731d81d 100644 --- a/generators/entity-i18n/templates/i18n/entity_fr.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_fr.json.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/entity-i18n/templates/i18n/entity_gl.json.ejs b/generators/entity-i18n/templates/i18n/entity_gl.json.ejs index d1ff9ba731df..9f87bd1356ed 100644 --- a/generators/entity-i18n/templates/i18n/entity_gl.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_gl.json.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/entity-i18n/templates/i18n/entity_hi.json.ejs b/generators/entity-i18n/templates/i18n/entity_hi.json.ejs index 26b93758fa71..12c0fd90f577 100644 --- a/generators/entity-i18n/templates/i18n/entity_hi.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_hi.json.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/entity-i18n/templates/i18n/entity_hr.json.ejs b/generators/entity-i18n/templates/i18n/entity_hr.json.ejs index 4e878b74b279..328283853f1c 100755 --- a/generators/entity-i18n/templates/i18n/entity_hr.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_hr.json.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/entity-i18n/templates/i18n/entity_hu.json.ejs b/generators/entity-i18n/templates/i18n/entity_hu.json.ejs index 27195c4fc960..42e1170dcd3f 100644 --- a/generators/entity-i18n/templates/i18n/entity_hu.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_hu.json.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/entity-i18n/templates/i18n/entity_hy.json.ejs b/generators/entity-i18n/templates/i18n/entity_hy.json.ejs index cd34e80db056..dc289a2a73c1 100644 --- a/generators/entity-i18n/templates/i18n/entity_hy.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_hy.json.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/entity-i18n/templates/i18n/entity_in.json.ejs b/generators/entity-i18n/templates/i18n/entity_in.json.ejs index 6dd31a3cda64..8ffd0b71dca8 100644 --- a/generators/entity-i18n/templates/i18n/entity_in.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_in.json.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/entity-i18n/templates/i18n/entity_it.json.ejs b/generators/entity-i18n/templates/i18n/entity_it.json.ejs index 600d8b956e9f..bfc7ee43a036 100644 --- a/generators/entity-i18n/templates/i18n/entity_it.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_it.json.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/entity-i18n/templates/i18n/entity_ja.json.ejs b/generators/entity-i18n/templates/i18n/entity_ja.json.ejs index fd952cd8fefa..acddf9ac01f4 100644 --- a/generators/entity-i18n/templates/i18n/entity_ja.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_ja.json.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/entity-i18n/templates/i18n/entity_ko.json.ejs b/generators/entity-i18n/templates/i18n/entity_ko.json.ejs index 2bedea91e118..6b27a9ba4ce1 100644 --- a/generators/entity-i18n/templates/i18n/entity_ko.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_ko.json.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/entity-i18n/templates/i18n/entity_mr.json.ejs b/generators/entity-i18n/templates/i18n/entity_mr.json.ejs index dd5a2c1aabd8..901687127d04 100644 --- a/generators/entity-i18n/templates/i18n/entity_mr.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_mr.json.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/entity-i18n/templates/i18n/entity_my.json.ejs b/generators/entity-i18n/templates/i18n/entity_my.json.ejs index dd1a05cac114..8e8bac5d3b17 100644 --- a/generators/entity-i18n/templates/i18n/entity_my.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_my.json.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/entity-i18n/templates/i18n/entity_nl.json.ejs b/generators/entity-i18n/templates/i18n/entity_nl.json.ejs index 699f733e1240..b5eaf754db26 100644 --- a/generators/entity-i18n/templates/i18n/entity_nl.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_nl.json.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/entity-i18n/templates/i18n/entity_pl.json.ejs b/generators/entity-i18n/templates/i18n/entity_pl.json.ejs index 656d1a4c8c1c..c922bd8759ff 100644 --- a/generators/entity-i18n/templates/i18n/entity_pl.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_pl.json.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/entity-i18n/templates/i18n/entity_pt-br.json.ejs b/generators/entity-i18n/templates/i18n/entity_pt-br.json.ejs index 052b70eb1dc9..47cab4a7b7aa 100644 --- a/generators/entity-i18n/templates/i18n/entity_pt-br.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_pt-br.json.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/entity-i18n/templates/i18n/entity_pt-pt.json.ejs b/generators/entity-i18n/templates/i18n/entity_pt-pt.json.ejs index 54f027869e0a..59cbd1557a3a 100644 --- a/generators/entity-i18n/templates/i18n/entity_pt-pt.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_pt-pt.json.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/entity-i18n/templates/i18n/entity_ro.json.ejs b/generators/entity-i18n/templates/i18n/entity_ro.json.ejs index f429626dcae8..c92e3f54cbe4 100644 --- a/generators/entity-i18n/templates/i18n/entity_ro.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_ro.json.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/entity-i18n/templates/i18n/entity_ru.json.ejs b/generators/entity-i18n/templates/i18n/entity_ru.json.ejs index 9764e64ae308..8e9dfb813b1c 100644 --- a/generators/entity-i18n/templates/i18n/entity_ru.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_ru.json.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/entity-i18n/templates/i18n/entity_si.json.ejs b/generators/entity-i18n/templates/i18n/entity_si.json.ejs index c69f8ef63e68..2428d3759905 100644 --- a/generators/entity-i18n/templates/i18n/entity_si.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_si.json.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/entity-i18n/templates/i18n/entity_sk.json.ejs b/generators/entity-i18n/templates/i18n/entity_sk.json.ejs index be8dd6830866..8e52a32cf636 100644 --- a/generators/entity-i18n/templates/i18n/entity_sk.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_sk.json.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/entity-i18n/templates/i18n/entity_sr.json.ejs b/generators/entity-i18n/templates/i18n/entity_sr.json.ejs index b32ff3a5ba52..b92b52dd22ed 100644 --- a/generators/entity-i18n/templates/i18n/entity_sr.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_sr.json.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/entity-i18n/templates/i18n/entity_sv.json.ejs b/generators/entity-i18n/templates/i18n/entity_sv.json.ejs index 78d57020a430..d2189ad82792 100644 --- a/generators/entity-i18n/templates/i18n/entity_sv.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_sv.json.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/entity-i18n/templates/i18n/entity_ta.json.ejs b/generators/entity-i18n/templates/i18n/entity_ta.json.ejs index da91e4b8061d..f07128b25d09 100644 --- a/generators/entity-i18n/templates/i18n/entity_ta.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_ta.json.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/entity-i18n/templates/i18n/entity_te.json.ejs b/generators/entity-i18n/templates/i18n/entity_te.json.ejs index 12392fd7d78a..b66fd97788fe 100644 --- a/generators/entity-i18n/templates/i18n/entity_te.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_te.json.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/entity-i18n/templates/i18n/entity_th.json.ejs b/generators/entity-i18n/templates/i18n/entity_th.json.ejs index e40fe29ee64c..9aecde477b2a 100644 --- a/generators/entity-i18n/templates/i18n/entity_th.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_th.json.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/entity-i18n/templates/i18n/entity_tr.json.ejs b/generators/entity-i18n/templates/i18n/entity_tr.json.ejs index 2bedea91e118..6b27a9ba4ce1 100644 --- a/generators/entity-i18n/templates/i18n/entity_tr.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_tr.json.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/entity-i18n/templates/i18n/entity_ua.json.ejs b/generators/entity-i18n/templates/i18n/entity_ua.json.ejs index 55ad2f5a6325..42dd937dea65 100644 --- a/generators/entity-i18n/templates/i18n/entity_ua.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_ua.json.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/entity-i18n/templates/i18n/entity_uz-Cyrl-uz.json.ejs b/generators/entity-i18n/templates/i18n/entity_uz-Cyrl-uz.json.ejs index 121270790e55..761defca93dc 100644 --- a/generators/entity-i18n/templates/i18n/entity_uz-Cyrl-uz.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_uz-Cyrl-uz.json.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/entity-i18n/templates/i18n/entity_uz-Latn-uz.json.ejs b/generators/entity-i18n/templates/i18n/entity_uz-Latn-uz.json.ejs index 78887b34e28f..4590401ad2c7 100644 --- a/generators/entity-i18n/templates/i18n/entity_uz-Latn-uz.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_uz-Latn-uz.json.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/entity-i18n/templates/i18n/entity_vi.json.ejs b/generators/entity-i18n/templates/i18n/entity_vi.json.ejs index 94820b0a475b..88b754b1110a 100644 --- a/generators/entity-i18n/templates/i18n/entity_vi.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_vi.json.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/entity-i18n/templates/i18n/entity_zh-cn.json.ejs b/generators/entity-i18n/templates/i18n/entity_zh-cn.json.ejs index e25c58d82fe6..0e9c6e75f303 100644 --- a/generators/entity-i18n/templates/i18n/entity_zh-cn.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_zh-cn.json.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/entity-i18n/templates/i18n/entity_zh-tw.json.ejs b/generators/entity-i18n/templates/i18n/entity_zh-tw.json.ejs index 1f717bb93071..437a67cff1e1 100644 --- a/generators/entity-i18n/templates/i18n/entity_zh-tw.json.ejs +++ b/generators/entity-i18n/templates/i18n/entity_zh-tw.json.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/entity-i18n/templates/i18n/enum.json.ejs b/generators/entity-i18n/templates/i18n/enum.json.ejs index b4676f8f8b58..836266d878bd 100644 --- a/generators/entity-i18n/templates/i18n/enum.json.ejs +++ b/generators/entity-i18n/templates/i18n/enum.json.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/entity-server/files.js b/generators/entity-server/files.js index f465c41e5d1a..932feb4e76f5 100644 --- a/generators/entity-server/files.js +++ b/generators/entity-server/files.js @@ -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/entity-server/index.js b/generators/entity-server/index.js index fd7e8aa0a702..dfb04b59008c 100644 --- a/generators/entity-server/index.js +++ b/generators/entity-server/index.js @@ -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/entity-server/templates/partials/it_patch_update.partial.java.ejs b/generators/entity-server/templates/partials/it_patch_update.partial.java.ejs index 29b42622edb6..ac6fb4ad510a 100644 --- a/generators/entity-server/templates/partials/it_patch_update.partial.java.ejs +++ b/generators/entity-server/templates/partials/it_patch_update.partial.java.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/entity-server/templates/src/main/java/package/common/delete_template.ejs b/generators/entity-server/templates/src/main/java/package/common/delete_template.ejs index 2fbf1df931df..306caadddad3 100644 --- a/generators/entity-server/templates/src/main/java/package/common/delete_template.ejs +++ b/generators/entity-server/templates/src/main/java/package/common/delete_template.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/entity-server/templates/src/main/java/package/common/field_validators.ejs b/generators/entity-server/templates/src/main/java/package/common/field_validators.ejs index 22af51de4e89..f30e33b3438e 100644 --- a/generators/entity-server/templates/src/main/java/package/common/field_validators.ejs +++ b/generators/entity-server/templates/src/main/java/package/common/field_validators.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/entity-server/templates/src/main/java/package/common/get_all_stream_template.ejs b/generators/entity-server/templates/src/main/java/package/common/get_all_stream_template.ejs index b151b47077b0..e4988ed6cc85 100644 --- a/generators/entity-server/templates/src/main/java/package/common/get_all_stream_template.ejs +++ b/generators/entity-server/templates/src/main/java/package/common/get_all_stream_template.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/entity-server/templates/src/main/java/package/common/get_all_template.ejs b/generators/entity-server/templates/src/main/java/package/common/get_all_template.ejs index f4b7aaad5feb..20679598df08 100644 --- a/generators/entity-server/templates/src/main/java/package/common/get_all_template.ejs +++ b/generators/entity-server/templates/src/main/java/package/common/get_all_template.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/entity-server/templates/src/main/java/package/common/get_filtered_template.ejs b/generators/entity-server/templates/src/main/java/package/common/get_filtered_template.ejs index de56a95c8200..73a6434184cd 100644 --- a/generators/entity-server/templates/src/main/java/package/common/get_filtered_template.ejs +++ b/generators/entity-server/templates/src/main/java/package/common/get_filtered_template.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/entity-server/templates/src/main/java/package/common/get_template.ejs b/generators/entity-server/templates/src/main/java/package/common/get_template.ejs index 453b0f5a4eff..ce68d430fa5d 100644 --- a/generators/entity-server/templates/src/main/java/package/common/get_template.ejs +++ b/generators/entity-server/templates/src/main/java/package/common/get_template.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/entity-server/templates/src/main/java/package/common/inject_template.ejs b/generators/entity-server/templates/src/main/java/package/common/inject_template.ejs index 513f574572c5..e5e73ac3a9f3 100644 --- a/generators/entity-server/templates/src/main/java/package/common/inject_template.ejs +++ b/generators/entity-server/templates/src/main/java/package/common/inject_template.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/entity-server/templates/src/main/java/package/common/patch_template.ejs b/generators/entity-server/templates/src/main/java/package/common/patch_template.ejs index fe733079122d..823e0dead62a 100644 --- a/generators/entity-server/templates/src/main/java/package/common/patch_template.ejs +++ b/generators/entity-server/templates/src/main/java/package/common/patch_template.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/entity-server/templates/src/main/java/package/common/save_template.ejs b/generators/entity-server/templates/src/main/java/package/common/save_template.ejs index 4cbaacc2e570..4d5eb12f742e 100644 --- a/generators/entity-server/templates/src/main/java/package/common/save_template.ejs +++ b/generators/entity-server/templates/src/main/java/package/common/save_template.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/entity-server/templates/src/main/java/package/common/save_template_reactive.ejs b/generators/entity-server/templates/src/main/java/package/common/save_template_reactive.ejs index 52be19a1f380..bcfd91c8d46d 100644 --- a/generators/entity-server/templates/src/main/java/package/common/save_template_reactive.ejs +++ b/generators/entity-server/templates/src/main/java/package/common/save_template_reactive.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/entity-server/templates/src/main/java/package/common/search_stream_template.ejs b/generators/entity-server/templates/src/main/java/package/common/search_stream_template.ejs index 14d459caf5d9..c9488ec706c0 100644 --- a/generators/entity-server/templates/src/main/java/package/common/search_stream_template.ejs +++ b/generators/entity-server/templates/src/main/java/package/common/search_stream_template.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/entity-server/templates/src/main/java/package/common/search_template.ejs b/generators/entity-server/templates/src/main/java/package/common/search_template.ejs index da4850d97b4f..244f4367be42 100644 --- a/generators/entity-server/templates/src/main/java/package/common/search_template.ejs +++ b/generators/entity-server/templates/src/main/java/package/common/search_template.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/entity-server/templates/src/main/java/package/domain/Entity.java.ejs b/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs index c3cd7fd70fec..5bf032586b81 100644 --- a/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/domain/Entity.java.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/entity-server/templates/src/main/java/package/domain/enumeration/Enum.java.ejs b/generators/entity-server/templates/src/main/java/package/domain/enumeration/Enum.java.ejs index 50ba9ba8e20a..56753afeed96 100644 --- a/generators/entity-server/templates/src/main/java/package/domain/enumeration/Enum.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/domain/enumeration/Enum.java.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/entity-server/templates/src/main/java/package/domain/relationship_validators.ejs b/generators/entity-server/templates/src/main/java/package/domain/relationship_validators.ejs index e1fd6cd275f4..71b280a1c7f6 100644 --- a/generators/entity-server/templates/src/main/java/package/domain/relationship_validators.ejs +++ b/generators/entity-server/templates/src/main/java/package/domain/relationship_validators.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/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs b/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs index c4d1e0446a19..b461de5ca10b 100644 --- a/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.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/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs b/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs index f872d051952c..9d695be96051 100644 --- a/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.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/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs b/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs index e886d61b342d..3d317e176c8e 100644 --- a/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.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/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.ejs b/generators/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.ejs index ac06796500b2..8af7d7d4917d 100644 --- a/generators/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.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/entity-server/templates/src/main/java/package/repository/search/EntitySearchRepository.java.ejs b/generators/entity-server/templates/src/main/java/package/repository/search/EntitySearchRepository.java.ejs index ca0797e09bff..13f75efa8bc1 100644 --- a/generators/entity-server/templates/src/main/java/package/repository/search/EntitySearchRepository.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/repository/search/EntitySearchRepository.java.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/entity-server/templates/src/main/java/package/service/EntityQueryService.java.ejs b/generators/entity-server/templates/src/main/java/package/service/EntityQueryService.java.ejs index 2c13d494aa16..c236479c6faa 100644 --- a/generators/entity-server/templates/src/main/java/package/service/EntityQueryService.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/service/EntityQueryService.java.ejs @@ -1,5 +1,5 @@ <%# - Copyright 2013-2020 the original author or authors. + Copyright 2013-2020 the original author or authors from the JHipster project. This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. @@ -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/entity-server/templates/src/main/java/package/service/EntityService.java.ejs b/generators/entity-server/templates/src/main/java/package/service/EntityService.java.ejs index 8509ea511ca6..b0e8a82c0936 100644 --- a/generators/entity-server/templates/src/main/java/package/service/EntityService.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/service/EntityService.java.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/entity-server/templates/src/main/java/package/service/dto/EntityDTO.java.ejs b/generators/entity-server/templates/src/main/java/package/service/dto/EntityDTO.java.ejs index d787dd77bca4..3986a4973d57 100644 --- a/generators/entity-server/templates/src/main/java/package/service/dto/EntityDTO.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/service/dto/EntityDTO.java.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/entity-server/templates/src/main/java/package/service/impl/EntityServiceImpl.java.ejs b/generators/entity-server/templates/src/main/java/package/service/impl/EntityServiceImpl.java.ejs index 6c7230845438..433b6a866c76 100644 --- a/generators/entity-server/templates/src/main/java/package/service/impl/EntityServiceImpl.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/service/impl/EntityServiceImpl.java.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/entity-server/templates/src/main/java/package/service/mapper/BaseEntityMapper.java.ejs b/generators/entity-server/templates/src/main/java/package/service/mapper/BaseEntityMapper.java.ejs index 34a4a9f5b8e2..9b5658962921 100644 --- a/generators/entity-server/templates/src/main/java/package/service/mapper/BaseEntityMapper.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/service/mapper/BaseEntityMapper.java.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/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.ejs b/generators/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.ejs index 799ce06fe50c..9e5d2637c7eb 100644 --- a/generators/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.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/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs b/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs index 3ccb9aae3b71..ee515756ad7e 100644 --- a/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs +++ b/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.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/entity-server/templates/src/main/resources/config/cql/changelog/added_entity.cql.ejs b/generators/entity-server/templates/src/main/resources/config/cql/changelog/added_entity.cql.ejs index 8232ac78f208..4ba1a5ec78d7 100644 --- a/generators/entity-server/templates/src/main/resources/config/cql/changelog/added_entity.cql.ejs +++ b/generators/entity-server/templates/src/main/resources/config/cql/changelog/added_entity.cql.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/entity-server/templates/src/test/gatling/user-files/simulations/EntityGatlingTest.scala.ejs b/generators/entity-server/templates/src/test/gatling/user-files/simulations/EntityGatlingTest.scala.ejs index 0ea249298966..7298b2014798 100644 --- a/generators/entity-server/templates/src/test/gatling/user-files/simulations/EntityGatlingTest.scala.ejs +++ b/generators/entity-server/templates/src/test/gatling/user-files/simulations/EntityGatlingTest.scala.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/entity-server/templates/src/test/java/package/domain/EntityTest.java.ejs b/generators/entity-server/templates/src/test/java/package/domain/EntityTest.java.ejs index 79a1eeeac8ad..358db3c436c7 100644 --- a/generators/entity-server/templates/src/test/java/package/domain/EntityTest.java.ejs +++ b/generators/entity-server/templates/src/test/java/package/domain/EntityTest.java.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/entity-server/templates/src/test/java/package/repository/search/EntitySearchRepositoryMockConfiguration.java.ejs b/generators/entity-server/templates/src/test/java/package/repository/search/EntitySearchRepositoryMockConfiguration.java.ejs index 97422c92b199..ad29b8f510da 100644 --- a/generators/entity-server/templates/src/test/java/package/repository/search/EntitySearchRepositoryMockConfiguration.java.ejs +++ b/generators/entity-server/templates/src/test/java/package/repository/search/EntitySearchRepositoryMockConfiguration.java.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/entity-server/templates/src/test/java/package/service/dto/EntityDTOTest.java.ejs b/generators/entity-server/templates/src/test/java/package/service/dto/EntityDTOTest.java.ejs index d379012e84a3..33c033ab47c9 100644 --- a/generators/entity-server/templates/src/test/java/package/service/dto/EntityDTOTest.java.ejs +++ b/generators/entity-server/templates/src/test/java/package/service/dto/EntityDTOTest.java.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/entity-server/templates/src/test/java/package/service/mapper/EntityMapperTest.java.ejs b/generators/entity-server/templates/src/test/java/package/service/mapper/EntityMapperTest.java.ejs index 512c38918e88..1e64a9ce048e 100644 --- a/generators/entity-server/templates/src/test/java/package/service/mapper/EntityMapperTest.java.ejs +++ b/generators/entity-server/templates/src/test/java/package/service/mapper/EntityMapperTest.java.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/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs b/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs index d4d890a3b422..a8505f9fd109 100644 --- a/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs +++ b/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.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/entity/index.js b/generators/entity/index.js index 3e0e80f7fd2a..48743414a347 100644 --- a/generators/entity/index.js +++ b/generators/entity/index.js @@ -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/entity/prompts.js b/generators/entity/prompts.js index 28afe096a568..871d38796294 100644 --- a/generators/entity/prompts.js +++ b/generators/entity/prompts.js @@ -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/export-jdl/index.js b/generators/export-jdl/index.js index 6232dae80bf9..ece940a4133c 100644 --- a/generators/export-jdl/index.js +++ b/generators/export-jdl/index.js @@ -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/gae/index.js b/generators/gae/index.js index e8311d5e6b76..5447ffbc27fc 100644 --- a/generators/gae/index.js +++ b/generators/gae/index.js @@ -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/gae/templates/app.yaml.ejs b/generators/gae/templates/app.yaml.ejs index e73f389a4bc2..4484c4c39667 100644 --- a/generators/gae/templates/app.yaml.ejs +++ b/generators/gae/templates/app.yaml.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/gae/templates/application-prod-gae.yml.ejs b/generators/gae/templates/application-prod-gae.yml.ejs index 912a4fbbeb48..0e2e938ef892 100644 --- a/generators/gae/templates/application-prod-gae.yml.ejs +++ b/generators/gae/templates/application-prod-gae.yml.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/gae/templates/dispatch.yaml.ejs b/generators/gae/templates/dispatch.yaml.ejs index 0dae0d00fe02..d374ee302723 100644 --- a/generators/gae/templates/dispatch.yaml.ejs +++ b/generators/gae/templates/dispatch.yaml.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/gae/templates/gae.gradle.ejs b/generators/gae/templates/gae.gradle.ejs index 04e8c02da614..8f6d7e3f4a57 100644 --- a/generators/gae/templates/gae.gradle.ejs +++ b/generators/gae/templates/gae.gradle.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/gae/templates/pom-gae-build-profile.xml.ejs b/generators/gae/templates/pom-gae-build-profile.xml.ejs index 13ed0bb511ae..95ae81c39d59 100644 --- a/generators/gae/templates/pom-gae-build-profile.xml.ejs +++ b/generators/gae/templates/pom-gae-build-profile.xml.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/gae/templates/pom-plugin.xml.ejs b/generators/gae/templates/pom-plugin.xml.ejs index c2a855ecd141..0a4994a0d684 100644 --- a/generators/gae/templates/pom-plugin.xml.ejs +++ b/generators/gae/templates/pom-plugin.xml.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/gae/templates/pom-profile.xml.ejs b/generators/gae/templates/pom-profile.xml.ejs index 0cd7f08c5098..9c886a9c6794 100644 --- a/generators/gae/templates/pom-profile.xml.ejs +++ b/generators/gae/templates/pom-profile.xml.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/generator-base-blueprint.js b/generators/generator-base-blueprint.js index 846149207616..a8e6fac9efa1 100644 --- a/generators/generator-base-blueprint.js +++ b/generators/generator-base-blueprint.js @@ -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/generator-base-docker.js b/generators/generator-base-docker.js index c8858d9f0775..f6e2849709d5 100644 --- a/generators/generator-base-docker.js +++ b/generators/generator-base-docker.js @@ -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/generator-base-private.js b/generators/generator-base-private.js index fd7ae6cd26f8..9aaa2f6ac6b1 100644 --- a/generators/generator-base-private.js +++ b/generators/generator-base-private.js @@ -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/generator-base.js b/generators/generator-base.js index 105cbbcf040b..b08122301fa0 100644 --- a/generators/generator-base.js +++ b/generators/generator-base.js @@ -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/generator-constants.js b/generators/generator-constants.js index 985c8aba8536..2ae3156cd566 100644 --- a/generators/generator-constants.js +++ b/generators/generator-constants.js @@ -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/generator-defaults.js b/generators/generator-defaults.js index a497bc51d57f..df62f0ddfdaf 100644 --- a/generators/generator-defaults.js +++ b/generators/generator-defaults.js @@ -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/generator-transforms.js b/generators/generator-transforms.js index 4e2800d762fd..c412c7242967 100644 --- a/generators/generator-transforms.js +++ b/generators/generator-transforms.js @@ -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/heroku/index.js b/generators/heroku/index.js index 7efd9cc9945d..eca0d64ba73c 100644 --- a/generators/heroku/index.js +++ b/generators/heroku/index.js @@ -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/heroku/templates/Procfile.ejs b/generators/heroku/templates/Procfile.ejs index 42dc40f8a7c8..6ed2bd2b0006 100644 --- a/generators/heroku/templates/Procfile.ejs +++ b/generators/heroku/templates/Procfile.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/heroku/templates/application-heroku.yml.ejs b/generators/heroku/templates/application-heroku.yml.ejs index de6ff8f71c4f..90531001a2b8 100644 --- a/generators/heroku/templates/application-heroku.yml.ejs +++ b/generators/heroku/templates/application-heroku.yml.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/heroku/templates/bootstrap-heroku.yml.ejs b/generators/heroku/templates/bootstrap-heroku.yml.ejs index e1566bec7a76..cc3e542f994a 100644 --- a/generators/heroku/templates/bootstrap-heroku.yml.ejs +++ b/generators/heroku/templates/bootstrap-heroku.yml.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/heroku/templates/heroku.gradle.ejs b/generators/heroku/templates/heroku.gradle.ejs index 2fe6688d9f67..e4d5fbfab7e6 100644 --- a/generators/heroku/templates/heroku.gradle.ejs +++ b/generators/heroku/templates/heroku.gradle.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/info/index.js b/generators/info/index.js index da37363af59c..ad09842e2dd3 100644 --- a/generators/info/index.js +++ b/generators/info/index.js @@ -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/kubernetes-base.js b/generators/kubernetes-base.js index f1cd4180962f..385ed41676b1 100644 --- a/generators/kubernetes-base.js +++ b/generators/kubernetes-base.js @@ -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/kubernetes-helm/files.js b/generators/kubernetes-helm/files.js index db7f9e43b0f0..a96f04594dc0 100644 --- a/generators/kubernetes-helm/files.js +++ b/generators/kubernetes-helm/files.js @@ -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/kubernetes-helm/index.js b/generators/kubernetes-helm/index.js index 3345d40bde9c..c28bc77dc579 100644 --- a/generators/kubernetes-helm/index.js +++ b/generators/kubernetes-helm/index.js @@ -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/kubernetes-helm/templates/helm-apply.sh.ejs b/generators/kubernetes-helm/templates/helm-apply.sh.ejs index ea6de366c217..3c0ba2877726 100644 --- a/generators/kubernetes-helm/templates/helm-apply.sh.ejs +++ b/generators/kubernetes-helm/templates/helm-apply.sh.ejs @@ -9,7 +9,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/kubernetes-helm/templates/helm-upgrade.sh.ejs b/generators/kubernetes-helm/templates/helm-upgrade.sh.ejs index 9fe899cfd763..761ec5e2b112 100644 --- a/generators/kubernetes-helm/templates/helm-upgrade.sh.ejs +++ b/generators/kubernetes-helm/templates/helm-upgrade.sh.ejs @@ -9,7 +9,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/kubernetes-knative/files.js b/generators/kubernetes-knative/files.js index 8ffb49bdcb15..9f2c5460f864 100644 --- a/generators/kubernetes-knative/files.js +++ b/generators/kubernetes-knative/files.js @@ -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/kubernetes-knative/index.js b/generators/kubernetes-knative/index.js index 24b96a6e4ef6..ebaad1ce6d7a 100644 --- a/generators/kubernetes-knative/index.js +++ b/generators/kubernetes-knative/index.js @@ -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/kubernetes-knative/prompts.js b/generators/kubernetes-knative/prompts.js index bd4ca9279853..87b0a9e2bb9d 100644 --- a/generators/kubernetes-knative/prompts.js +++ b/generators/kubernetes-knative/prompts.js @@ -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/kubernetes-knative/templates/helm-apply.sh.ejs b/generators/kubernetes-knative/templates/helm-apply.sh.ejs index db11e707e703..b3e57c4e3f9d 100644 --- a/generators/kubernetes-knative/templates/helm-apply.sh.ejs +++ b/generators/kubernetes-knative/templates/helm-apply.sh.ejs @@ -1,6 +1,6 @@ #!/bin/bash <%# - Copyright 2013-2018 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. @@ -9,7 +9,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/kubernetes-knative/templates/helm-upgrade.sh.ejs b/generators/kubernetes-knative/templates/helm-upgrade.sh.ejs index 271ece1aaa05..8e1d69bd9898 100644 --- a/generators/kubernetes-knative/templates/helm-upgrade.sh.ejs +++ b/generators/kubernetes-knative/templates/helm-upgrade.sh.ejs @@ -1,6 +1,6 @@ #!/bin/bash <%# - Copyright 2013-2018 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. @@ -9,7 +9,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/kubernetes-knative/templates/istio/gateway.yml.ejs b/generators/kubernetes-knative/templates/istio/gateway.yml.ejs index 89fa84584585..59f6a3ea21a1 100644 --- a/generators/kubernetes-knative/templates/istio/gateway.yml.ejs +++ b/generators/kubernetes-knative/templates/istio/gateway.yml.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/kubernetes-knative/templates/kubectl-apply.sh.ejs b/generators/kubernetes-knative/templates/kubectl-apply.sh.ejs index ceb27f6e02f6..7bba4b4b0ce1 100755 --- a/generators/kubernetes-knative/templates/kubectl-apply.sh.ejs +++ b/generators/kubernetes-knative/templates/kubectl-apply.sh.ejs @@ -9,7 +9,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/kubernetes-knative/templates/service.yml.ejs b/generators/kubernetes-knative/templates/service.yml.ejs index 8147ee48606c..97b75c431f06 100644 --- a/generators/kubernetes-knative/templates/service.yml.ejs +++ b/generators/kubernetes-knative/templates/service.yml.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/kubernetes/files.js b/generators/kubernetes/files.js index 4d35bc26e41f..d93fabc4f56d 100644 --- a/generators/kubernetes/files.js +++ b/generators/kubernetes/files.js @@ -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/kubernetes/index.js b/generators/kubernetes/index.js index ca03dff29ec5..913d9bab83e1 100644 --- a/generators/kubernetes/index.js +++ b/generators/kubernetes/index.js @@ -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/kubernetes/prompts.js b/generators/kubernetes/prompts.js index b47496f114ea..a8fbf5242eb7 100644 --- a/generators/kubernetes/prompts.js +++ b/generators/kubernetes/prompts.js @@ -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/kubernetes/templates/db/couchbase.yml.ejs b/generators/kubernetes/templates/db/couchbase.yml.ejs index 8aca74f058c5..57e789f57ab3 100644 --- a/generators/kubernetes/templates/db/couchbase.yml.ejs +++ b/generators/kubernetes/templates/db/couchbase.yml.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/kubernetes/templates/db/elasticsearch.yml.ejs b/generators/kubernetes/templates/db/elasticsearch.yml.ejs index 5ab1cee3b280..c49daba9cea3 100644 --- a/generators/kubernetes/templates/db/elasticsearch.yml.ejs +++ b/generators/kubernetes/templates/db/elasticsearch.yml.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/kubernetes/templates/db/mariadb.yml.ejs b/generators/kubernetes/templates/db/mariadb.yml.ejs index e195eeb6b793..428ca789382a 100644 --- a/generators/kubernetes/templates/db/mariadb.yml.ejs +++ b/generators/kubernetes/templates/db/mariadb.yml.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/kubernetes/templates/db/mongodb.yml.ejs b/generators/kubernetes/templates/db/mongodb.yml.ejs index a51a244971be..77613bfd0cb3 100644 --- a/generators/kubernetes/templates/db/mongodb.yml.ejs +++ b/generators/kubernetes/templates/db/mongodb.yml.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/kubernetes/templates/db/mssql.yml.ejs b/generators/kubernetes/templates/db/mssql.yml.ejs index ef7e0a2fed40..050b24506b06 100644 --- a/generators/kubernetes/templates/db/mssql.yml.ejs +++ b/generators/kubernetes/templates/db/mssql.yml.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/kubernetes/templates/db/mysql.yml.ejs b/generators/kubernetes/templates/db/mysql.yml.ejs index de6a13990e4d..1c4bc336e971 100644 --- a/generators/kubernetes/templates/db/mysql.yml.ejs +++ b/generators/kubernetes/templates/db/mysql.yml.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/kubernetes/templates/db/postgresql.yml.ejs b/generators/kubernetes/templates/db/postgresql.yml.ejs index 3ae8ae2bc6c5..50cef0e67240 100644 --- a/generators/kubernetes/templates/db/postgresql.yml.ejs +++ b/generators/kubernetes/templates/db/postgresql.yml.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/kubernetes/templates/deployment.yml.ejs b/generators/kubernetes/templates/deployment.yml.ejs index e4b185d6fec7..c29f013bc0b8 100644 --- a/generators/kubernetes/templates/deployment.yml.ejs +++ b/generators/kubernetes/templates/deployment.yml.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/kubernetes/templates/ingress.yml.ejs b/generators/kubernetes/templates/ingress.yml.ejs index 14f1465016e3..37a9de26d9f7 100644 --- a/generators/kubernetes/templates/ingress.yml.ejs +++ b/generators/kubernetes/templates/ingress.yml.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/kubernetes/templates/istio/gateway.yml.ejs b/generators/kubernetes/templates/istio/gateway.yml.ejs index 1b7720a4716d..6e7e9a07d883 100644 --- a/generators/kubernetes/templates/istio/gateway.yml.ejs +++ b/generators/kubernetes/templates/istio/gateway.yml.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/kubernetes/templates/istio/gateway/grafana-gateway.yml.ejs b/generators/kubernetes/templates/istio/gateway/grafana-gateway.yml.ejs index ecfce1a4f523..654c9ca16c87 100644 --- a/generators/kubernetes/templates/istio/gateway/grafana-gateway.yml.ejs +++ b/generators/kubernetes/templates/istio/gateway/grafana-gateway.yml.ejs @@ -1,5 +1,5 @@ <%# - Copyright 2013-2018 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. @@ -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/kubernetes/templates/istio/gateway/jhipster-grafana-gateway.yml.ejs b/generators/kubernetes/templates/istio/gateway/jhipster-grafana-gateway.yml.ejs index a78466d5cb67..67fbde0ea1b3 100644 --- a/generators/kubernetes/templates/istio/gateway/jhipster-grafana-gateway.yml.ejs +++ b/generators/kubernetes/templates/istio/gateway/jhipster-grafana-gateway.yml.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/kubernetes/templates/istio/gateway/kiali-gateway.yml.ejs b/generators/kubernetes/templates/istio/gateway/kiali-gateway.yml.ejs index ca47ec99d82c..735fa6a5de74 100644 --- a/generators/kubernetes/templates/istio/gateway/kiali-gateway.yml.ejs +++ b/generators/kubernetes/templates/istio/gateway/kiali-gateway.yml.ejs @@ -1,5 +1,5 @@ <%# - Copyright 2013-2018 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. @@ -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/kubernetes/templates/istio/gateway/zipkin-gateway.yml.ejs b/generators/kubernetes/templates/istio/gateway/zipkin-gateway.yml.ejs index f74da01f5d65..19cc1300991f 100644 --- a/generators/kubernetes/templates/istio/gateway/zipkin-gateway.yml.ejs +++ b/generators/kubernetes/templates/istio/gateway/zipkin-gateway.yml.ejs @@ -1,5 +1,5 @@ <%# - Copyright 2013-2018 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. @@ -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/kubernetes/templates/kubectl-apply.sh.ejs b/generators/kubernetes/templates/kubectl-apply.sh.ejs index 4f4d46246bac..29ea0429de00 100755 --- a/generators/kubernetes/templates/kubectl-apply.sh.ejs +++ b/generators/kubernetes/templates/kubectl-apply.sh.ejs @@ -9,7 +9,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/kubernetes/templates/messagebroker/kafka.yml.ejs b/generators/kubernetes/templates/messagebroker/kafka.yml.ejs index 7da3196ce5ef..1f5ef8876de9 100644 --- a/generators/kubernetes/templates/messagebroker/kafka.yml.ejs +++ b/generators/kubernetes/templates/messagebroker/kafka.yml.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/kubernetes/templates/monitoring/jhipster-grafana-dashboard.yml.ejs b/generators/kubernetes/templates/monitoring/jhipster-grafana-dashboard.yml.ejs index 00025886475a..5330c7caee05 100644 --- a/generators/kubernetes/templates/monitoring/jhipster-grafana-dashboard.yml.ejs +++ b/generators/kubernetes/templates/monitoring/jhipster-grafana-dashboard.yml.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/kubernetes/templates/monitoring/jhipster-grafana.yml.ejs b/generators/kubernetes/templates/monitoring/jhipster-grafana.yml.ejs index 48c069adb7f6..ff0c19f1885a 100644 --- a/generators/kubernetes/templates/monitoring/jhipster-grafana.yml.ejs +++ b/generators/kubernetes/templates/monitoring/jhipster-grafana.yml.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/kubernetes/templates/monitoring/jhipster-prometheus-cr.yml.ejs b/generators/kubernetes/templates/monitoring/jhipster-prometheus-cr.yml.ejs index 1fd8eb103f64..51292f4839c6 100644 --- a/generators/kubernetes/templates/monitoring/jhipster-prometheus-cr.yml.ejs +++ b/generators/kubernetes/templates/monitoring/jhipster-prometheus-cr.yml.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/kubernetes/templates/monitoring/jhipster-prometheus-crd.yml.ejs b/generators/kubernetes/templates/monitoring/jhipster-prometheus-crd.yml.ejs index 2e5b03acc408..115817602215 100644 --- a/generators/kubernetes/templates/monitoring/jhipster-prometheus-crd.yml.ejs +++ b/generators/kubernetes/templates/monitoring/jhipster-prometheus-crd.yml.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/kubernetes/templates/monitoring/jhipster-prometheus-sm.yml.ejs b/generators/kubernetes/templates/monitoring/jhipster-prometheus-sm.yml.ejs index a67b2914cd00..a6855c8a8fe9 100644 --- a/generators/kubernetes/templates/monitoring/jhipster-prometheus-sm.yml.ejs +++ b/generators/kubernetes/templates/monitoring/jhipster-prometheus-sm.yml.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/kubernetes/templates/namespace.yml.ejs b/generators/kubernetes/templates/namespace.yml.ejs index 504efd4889c6..dfaa0b8a581f 100644 --- a/generators/kubernetes/templates/namespace.yml.ejs +++ b/generators/kubernetes/templates/namespace.yml.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/kubernetes/templates/registry/application-configmap.yml.ejs b/generators/kubernetes/templates/registry/application-configmap.yml.ejs index 46f85cf9ab20..af989a7cd57a 100644 --- a/generators/kubernetes/templates/registry/application-configmap.yml.ejs +++ b/generators/kubernetes/templates/registry/application-configmap.yml.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/kubernetes/templates/registry/consul-config-loader.yml.ejs b/generators/kubernetes/templates/registry/consul-config-loader.yml.ejs index 1546932833d9..79db9eb8dd27 100644 --- a/generators/kubernetes/templates/registry/consul-config-loader.yml.ejs +++ b/generators/kubernetes/templates/registry/consul-config-loader.yml.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/kubernetes/templates/registry/consul.yml.ejs b/generators/kubernetes/templates/registry/consul.yml.ejs index b8f138628331..eb38824482c1 100644 --- a/generators/kubernetes/templates/registry/consul.yml.ejs +++ b/generators/kubernetes/templates/registry/consul.yml.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/kubernetes/templates/registry/jhipster-registry.yml.ejs b/generators/kubernetes/templates/registry/jhipster-registry.yml.ejs index e2b3d54ce20e..66f0a718d12e 100644 --- a/generators/kubernetes/templates/registry/jhipster-registry.yml.ejs +++ b/generators/kubernetes/templates/registry/jhipster-registry.yml.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/kubernetes/templates/secret/jwt-secret.yml.ejs b/generators/kubernetes/templates/secret/jwt-secret.yml.ejs index 64afd9928e3f..94a1f6b24a30 100644 --- a/generators/kubernetes/templates/secret/jwt-secret.yml.ejs +++ b/generators/kubernetes/templates/secret/jwt-secret.yml.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/kubernetes/templates/service.yml.ejs b/generators/kubernetes/templates/service.yml.ejs index d0946f898c63..09758b4f3e32 100644 --- a/generators/kubernetes/templates/service.yml.ejs +++ b/generators/kubernetes/templates/service.yml.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/languages/index.js b/generators/languages/index.js index 5835177b0acf..a8619dff743c 100644 --- a/generators/languages/index.js +++ b/generators/languages/index.js @@ -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/languages/prompts.js b/generators/languages/prompts.js index f36d204b381b..9a76a9beeeb6 100644 --- a/generators/languages/prompts.js +++ b/generators/languages/prompts.js @@ -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/languages/templates/src/main/resources/i18n/messages_al.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_al.properties.ejs index da95c147840d..54776bdc9ade 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_al.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_al.properties.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/languages/templates/src/main/resources/i18n/messages_ar_LY.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_ar_LY.properties.ejs index 29f5bbcaf513..865c3e6d8914 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_ar_LY.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_ar_LY.properties.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/languages/templates/src/main/resources/i18n/messages_bg.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_bg.properties.ejs index db8ad1755170..8bc66297dd10 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_bg.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_bg.properties.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/languages/templates/src/main/resources/i18n/messages_bn.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_bn.properties.ejs index 2a6001a94552..0ab9586f0b89 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_bn.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_bn.properties.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/languages/templates/src/main/resources/i18n/messages_by.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_by.properties.ejs index 019f35f28c93..7941a6c766ff 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_by.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_by.properties.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/languages/templates/src/main/resources/i18n/messages_ca.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_ca.properties.ejs index a24a07bdf76b..3e68a622d2c3 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_ca.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_ca.properties.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/languages/templates/src/main/resources/i18n/messages_cs.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_cs.properties.ejs index 831bb20deee2..7e3dfbce8d1b 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_cs.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_cs.properties.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/languages/templates/src/main/resources/i18n/messages_da.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_da.properties.ejs index 7f21d2737340..9520fdb12b97 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_da.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_da.properties.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/languages/templates/src/main/resources/i18n/messages_de.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_de.properties.ejs index 51fb3c964242..8667c0d06415 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_de.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_de.properties.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/languages/templates/src/main/resources/i18n/messages_el.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_el.properties.ejs index 161504907bfa..1fe8ccbfa3b8 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_el.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_el.properties.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/languages/templates/src/main/resources/i18n/messages_en.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_en.properties.ejs index 2a6001a94552..0ab9586f0b89 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_en.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_en.properties.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/languages/templates/src/main/resources/i18n/messages_es.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_es.properties.ejs index 897843ac9481..14c2f7d1b1a7 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_es.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_es.properties.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/languages/templates/src/main/resources/i18n/messages_et.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_et.properties.ejs index 6a4cd27993e9..a95fc7b9e519 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_et.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_et.properties.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/languages/templates/src/main/resources/i18n/messages_fa.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_fa.properties.ejs index d6da1299de0f..0912961e50cd 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_fa.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_fa.properties.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/languages/templates/src/main/resources/i18n/messages_fi.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_fi.properties.ejs index fc38bcaad8ba..836c8be0c467 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_fi.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_fi.properties.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/languages/templates/src/main/resources/i18n/messages_fr.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_fr.properties.ejs index 933142532034..598bce70a27c 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_fr.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_fr.properties.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/languages/templates/src/main/resources/i18n/messages_gl.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_gl.properties.ejs index 1762f8c66abe..8efb2166dc51 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_gl.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_gl.properties.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/languages/templates/src/main/resources/i18n/messages_hi.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_hi.properties.ejs index a60570645f91..064f83ccf5ac 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_hi.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_hi.properties.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/languages/templates/src/main/resources/i18n/messages_hr.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_hr.properties.ejs index 90841e269146..dd234d4adc0c 100755 --- a/generators/languages/templates/src/main/resources/i18n/messages_hr.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_hr.properties.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/languages/templates/src/main/resources/i18n/messages_hu.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_hu.properties.ejs index 6d4dad4b26d2..b6fef1052381 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_hu.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_hu.properties.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/languages/templates/src/main/resources/i18n/messages_hy.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_hy.properties.ejs index ecf7a9786e0e..8b99ab09da8f 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_hy.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_hy.properties.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/languages/templates/src/main/resources/i18n/messages_in.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_in.properties.ejs index b4119cd333c3..f9572eb03127 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_in.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_in.properties.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/languages/templates/src/main/resources/i18n/messages_it.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_it.properties.ejs index 4206e3af323e..3ce7754ee6c2 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_it.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_it.properties.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/languages/templates/src/main/resources/i18n/messages_ja.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_ja.properties.ejs index d17aeeec3eee..1396cf0c5bce 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_ja.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_ja.properties.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/languages/templates/src/main/resources/i18n/messages_ko.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_ko.properties.ejs index f0ab26e07cfe..084ce9f3b428 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_ko.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_ko.properties.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/languages/templates/src/main/resources/i18n/messages_mr.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_mr.properties.ejs index 2b792d1fe698..918eafefe67f 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_mr.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_mr.properties.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/languages/templates/src/main/resources/i18n/messages_my.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_my.properties.ejs index 72f94ce0945d..4016d7675dfe 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_my.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_my.properties.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/languages/templates/src/main/resources/i18n/messages_nl.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_nl.properties.ejs index ea6d67d112b1..ad1f48f62bd1 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_nl.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_nl.properties.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/languages/templates/src/main/resources/i18n/messages_pl.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_pl.properties.ejs index cfc01b2cb1bd..89983fdbdd79 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_pl.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_pl.properties.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/languages/templates/src/main/resources/i18n/messages_pt_BR.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_pt_BR.properties.ejs index c5435f7edcd8..50047de63791 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_pt_BR.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_pt_BR.properties.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/languages/templates/src/main/resources/i18n/messages_pt_PT.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_pt_PT.properties.ejs index 87f87ff1ad8f..3bc3ab67e514 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_pt_PT.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_pt_PT.properties.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/languages/templates/src/main/resources/i18n/messages_ro.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_ro.properties.ejs index 0bb469822f46..97dd59f0fa8b 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_ro.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_ro.properties.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/languages/templates/src/main/resources/i18n/messages_ru.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_ru.properties.ejs index 4a963e9aed7a..58b0da1817df 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_ru.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_ru.properties.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/languages/templates/src/main/resources/i18n/messages_si.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_si.properties.ejs index 46b22d2df18c..79b3071ae6b8 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_si.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_si.properties.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/languages/templates/src/main/resources/i18n/messages_sk.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_sk.properties.ejs index 8c5ecd9c05f3..78aae5c9e6a8 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_sk.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_sk.properties.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/languages/templates/src/main/resources/i18n/messages_sr.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_sr.properties.ejs index 50a84aa9d44f..d31366166757 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_sr.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_sr.properties.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/languages/templates/src/main/resources/i18n/messages_sv.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_sv.properties.ejs index 33785518c1d9..5a3c02092237 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_sv.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_sv.properties.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/languages/templates/src/main/resources/i18n/messages_ta.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_ta.properties.ejs index 7431190b995b..d764548d54f0 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_ta.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_ta.properties.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/languages/templates/src/main/resources/i18n/messages_te.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_te.properties.ejs index 6f7346f1efed..052b3f755e8d 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_te.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_te.properties.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/languages/templates/src/main/resources/i18n/messages_th.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_th.properties.ejs index 9005c48a8999..17878cb886bb 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_th.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_th.properties.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/languages/templates/src/main/resources/i18n/messages_tr.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_tr.properties.ejs index 42fa8deb2ffd..7a50ebe66969 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_tr.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_tr.properties.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/languages/templates/src/main/resources/i18n/messages_ua.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_ua.properties.ejs index 483c35f6331d..442e25b17894 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_ua.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_ua.properties.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/languages/templates/src/main/resources/i18n/messages_uz_Cyrl_UZ.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_uz_Cyrl_UZ.properties.ejs index 0e595d770f7f..cfd18b6e45d0 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_uz_Cyrl_UZ.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_uz_Cyrl_UZ.properties.ejs @@ -1,11 +1,15 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. + 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"); 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, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/generators/languages/templates/src/main/resources/i18n/messages_uz_Latn_UZ.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_uz_Latn_UZ.properties.ejs index 2a24f6d88328..cc852fee7401 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_uz_Latn_UZ.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_uz_Latn_UZ.properties.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/languages/templates/src/main/resources/i18n/messages_vi.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_vi.properties.ejs index f435e5a1f9e5..2c572b1a4405 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_vi.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_vi.properties.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/languages/templates/src/main/resources/i18n/messages_zh_CN.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_zh_CN.properties.ejs index 97484f9e920a..d1f038117d7d 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_zh_CN.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_zh_CN.properties.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/languages/templates/src/main/resources/i18n/messages_zh_TW.properties.ejs b/generators/languages/templates/src/main/resources/i18n/messages_zh_TW.properties.ejs index 777c0a02c5c9..6d3c792135bf 100644 --- a/generators/languages/templates/src/main/resources/i18n/messages_zh_TW.properties.ejs +++ b/generators/languages/templates/src/main/resources/i18n/messages_zh_TW.properties.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/languages/templates/src/main/webapp/i18n/al/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/al/activate.json.ejs index 46c24a3a16a5..0510c75f73a0 100644 --- a/generators/languages/templates/src/main/webapp/i18n/al/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/al/activate.json.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/languages/templates/src/main/webapp/i18n/al/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/al/global.json.ejs index 046607cbb694..95f0d8908800 100644 --- a/generators/languages/templates/src/main/webapp/i18n/al/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/al/global.json.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/languages/templates/src/main/webapp/i18n/al/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/al/health.json.ejs index 2a252fbd5dae..7bc715aed6e4 100644 --- a/generators/languages/templates/src/main/webapp/i18n/al/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/al/health.json.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/languages/templates/src/main/webapp/i18n/al/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/al/reset.json.ejs index 41aa59baac41..f92d900ad33f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/al/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/al/reset.json.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/languages/templates/src/main/webapp/i18n/ar-ly/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ar-ly/activate.json.ejs index cc79c97c5f68..639214c0677b 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ar-ly/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ar-ly/activate.json.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/languages/templates/src/main/webapp/i18n/ar-ly/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ar-ly/global.json.ejs index 4bff52bb30ea..b522a98e674d 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ar-ly/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ar-ly/global.json.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/languages/templates/src/main/webapp/i18n/ar-ly/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ar-ly/health.json.ejs index 34628b025a30..5e3874fd75f6 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ar-ly/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ar-ly/health.json.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/languages/templates/src/main/webapp/i18n/ar-ly/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ar-ly/reset.json.ejs index ab2d4b124abe..481693289b24 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ar-ly/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ar-ly/reset.json.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/languages/templates/src/main/webapp/i18n/bg/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/bg/activate.json.ejs index 7fdeec8ef6b4..42ba0c4f6d2e 100644 --- a/generators/languages/templates/src/main/webapp/i18n/bg/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/bg/activate.json.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/languages/templates/src/main/webapp/i18n/bg/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/bg/global.json.ejs index d57fa8883d7a..f2a104b2d2de 100644 --- a/generators/languages/templates/src/main/webapp/i18n/bg/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/bg/global.json.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/languages/templates/src/main/webapp/i18n/bg/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/bg/health.json.ejs index b89fd4431bec..8c4f1e9e0c14 100644 --- a/generators/languages/templates/src/main/webapp/i18n/bg/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/bg/health.json.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/languages/templates/src/main/webapp/i18n/bg/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/bg/reset.json.ejs index 7c060c7136b9..7945ace16f48 100644 --- a/generators/languages/templates/src/main/webapp/i18n/bg/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/bg/reset.json.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/languages/templates/src/main/webapp/i18n/bn/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/bn/activate.json.ejs index 2ba063efe8c2..583f8d08c905 100644 --- a/generators/languages/templates/src/main/webapp/i18n/bn/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/bn/activate.json.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/languages/templates/src/main/webapp/i18n/bn/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/bn/global.json.ejs index ba2aba1aa2b2..0f212cd18c9d 100644 --- a/generators/languages/templates/src/main/webapp/i18n/bn/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/bn/global.json.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/languages/templates/src/main/webapp/i18n/bn/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/bn/health.json.ejs index 1cd0a2fc7891..7df5cbe80c7f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/bn/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/bn/health.json.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/languages/templates/src/main/webapp/i18n/bn/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/bn/reset.json.ejs index 23139bc91605..d46fe7c15eca 100644 --- a/generators/languages/templates/src/main/webapp/i18n/bn/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/bn/reset.json.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/languages/templates/src/main/webapp/i18n/by/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/by/activate.json.ejs index bf4e48184438..02e973a8b876 100644 --- a/generators/languages/templates/src/main/webapp/i18n/by/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/by/activate.json.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/languages/templates/src/main/webapp/i18n/by/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/by/global.json.ejs index fecee40c11ac..fa19f0bb2a1c 100644 --- a/generators/languages/templates/src/main/webapp/i18n/by/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/by/global.json.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/languages/templates/src/main/webapp/i18n/by/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/by/health.json.ejs index 4378f0e545f6..50e73d22a3e6 100644 --- a/generators/languages/templates/src/main/webapp/i18n/by/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/by/health.json.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/languages/templates/src/main/webapp/i18n/by/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/by/reset.json.ejs index c3adf60d0883..8a2cf6d78460 100644 --- a/generators/languages/templates/src/main/webapp/i18n/by/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/by/reset.json.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/languages/templates/src/main/webapp/i18n/ca/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ca/activate.json.ejs index 300f3f9dd0e9..bc07bf62d9a6 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ca/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ca/activate.json.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/languages/templates/src/main/webapp/i18n/ca/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ca/global.json.ejs index d0312fb86b3e..04a13fa9df2f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ca/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ca/global.json.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/languages/templates/src/main/webapp/i18n/ca/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ca/health.json.ejs index 781cb7125bc3..382db45b94cf 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ca/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ca/health.json.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/languages/templates/src/main/webapp/i18n/ca/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ca/reset.json.ejs index 876686505ce6..7b44474f6e66 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ca/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ca/reset.json.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/languages/templates/src/main/webapp/i18n/cs/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/cs/activate.json.ejs index 39056aaa5296..bbffdaec0795 100644 --- a/generators/languages/templates/src/main/webapp/i18n/cs/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/cs/activate.json.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/languages/templates/src/main/webapp/i18n/cs/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/cs/global.json.ejs index 86fd0ebc192f..53363068bb81 100644 --- a/generators/languages/templates/src/main/webapp/i18n/cs/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/cs/global.json.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/languages/templates/src/main/webapp/i18n/cs/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/cs/health.json.ejs index 15007c683da0..b46fd83d1c2f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/cs/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/cs/health.json.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/languages/templates/src/main/webapp/i18n/cs/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/cs/reset.json.ejs index 93873a1a0448..df47ca571de1 100644 --- a/generators/languages/templates/src/main/webapp/i18n/cs/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/cs/reset.json.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/languages/templates/src/main/webapp/i18n/da/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/da/activate.json.ejs index 31278a699beb..913809a758b3 100644 --- a/generators/languages/templates/src/main/webapp/i18n/da/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/da/activate.json.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/languages/templates/src/main/webapp/i18n/da/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/da/global.json.ejs index 8f469e0ea0a2..3f25b21f44af 100644 --- a/generators/languages/templates/src/main/webapp/i18n/da/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/da/global.json.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/languages/templates/src/main/webapp/i18n/da/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/da/health.json.ejs index ddc3bf35a966..88552ee2b016 100644 --- a/generators/languages/templates/src/main/webapp/i18n/da/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/da/health.json.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/languages/templates/src/main/webapp/i18n/da/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/da/reset.json.ejs index 23139bc91605..d46fe7c15eca 100644 --- a/generators/languages/templates/src/main/webapp/i18n/da/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/da/reset.json.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/languages/templates/src/main/webapp/i18n/de/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/de/activate.json.ejs index a03ffbfbd95c..50936830f9b0 100644 --- a/generators/languages/templates/src/main/webapp/i18n/de/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/de/activate.json.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/languages/templates/src/main/webapp/i18n/de/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/de/global.json.ejs index f83eb9b7d64a..5588c70614bf 100644 --- a/generators/languages/templates/src/main/webapp/i18n/de/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/de/global.json.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/languages/templates/src/main/webapp/i18n/de/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/de/health.json.ejs index d114998bcc81..865b503ddf3e 100644 --- a/generators/languages/templates/src/main/webapp/i18n/de/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/de/health.json.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/languages/templates/src/main/webapp/i18n/de/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/de/reset.json.ejs index 8a7a62063af4..d106271e78ff 100644 --- a/generators/languages/templates/src/main/webapp/i18n/de/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/de/reset.json.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/languages/templates/src/main/webapp/i18n/el/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/el/activate.json.ejs index bffc301c8ccb..321a87cf8922 100644 --- a/generators/languages/templates/src/main/webapp/i18n/el/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/el/activate.json.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/languages/templates/src/main/webapp/i18n/el/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/el/global.json.ejs index e1e431103cf9..0d39b4b2e2e1 100644 --- a/generators/languages/templates/src/main/webapp/i18n/el/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/el/global.json.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/languages/templates/src/main/webapp/i18n/el/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/el/health.json.ejs index 8be943457199..302335dd2463 100644 --- a/generators/languages/templates/src/main/webapp/i18n/el/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/el/health.json.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/languages/templates/src/main/webapp/i18n/el/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/el/reset.json.ejs index 6d4f7ac60348..191d924dda76 100644 --- a/generators/languages/templates/src/main/webapp/i18n/el/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/el/reset.json.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/languages/templates/src/main/webapp/i18n/en/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/en/activate.json.ejs index c726c674d513..d8a67cf60e36 100644 --- a/generators/languages/templates/src/main/webapp/i18n/en/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/en/activate.json.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/languages/templates/src/main/webapp/i18n/en/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/en/global.json.ejs index ba2aba1aa2b2..0f212cd18c9d 100644 --- a/generators/languages/templates/src/main/webapp/i18n/en/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/en/global.json.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/languages/templates/src/main/webapp/i18n/en/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/en/health.json.ejs index bb4e325ecacf..26ebfb94b791 100644 --- a/generators/languages/templates/src/main/webapp/i18n/en/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/en/health.json.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/languages/templates/src/main/webapp/i18n/en/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/en/reset.json.ejs index 23139bc91605..d46fe7c15eca 100644 --- a/generators/languages/templates/src/main/webapp/i18n/en/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/en/reset.json.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/languages/templates/src/main/webapp/i18n/es/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/es/activate.json.ejs index ac0bb6e57692..6576ba4700be 100644 --- a/generators/languages/templates/src/main/webapp/i18n/es/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/es/activate.json.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/languages/templates/src/main/webapp/i18n/es/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/es/global.json.ejs index 6a76fed0848b..3c700e4f0463 100644 --- a/generators/languages/templates/src/main/webapp/i18n/es/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/es/global.json.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/languages/templates/src/main/webapp/i18n/es/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/es/health.json.ejs index c7a6c9864ab5..1fad9b70ef14 100644 --- a/generators/languages/templates/src/main/webapp/i18n/es/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/es/health.json.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/languages/templates/src/main/webapp/i18n/es/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/es/reset.json.ejs index 361ed73a4819..13fac459cd24 100644 --- a/generators/languages/templates/src/main/webapp/i18n/es/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/es/reset.json.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/languages/templates/src/main/webapp/i18n/et/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/et/activate.json.ejs index 2aecaab11294..19ced7bd2ea1 100644 --- a/generators/languages/templates/src/main/webapp/i18n/et/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/et/activate.json.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/languages/templates/src/main/webapp/i18n/et/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/et/global.json.ejs index 8c670a48447c..67c9c4b9f87c 100644 --- a/generators/languages/templates/src/main/webapp/i18n/et/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/et/global.json.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/languages/templates/src/main/webapp/i18n/et/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/et/health.json.ejs index 23e8257fad75..f91709823d26 100644 --- a/generators/languages/templates/src/main/webapp/i18n/et/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/et/health.json.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/languages/templates/src/main/webapp/i18n/et/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/et/reset.json.ejs index a0f672bda809..356d361554a4 100644 --- a/generators/languages/templates/src/main/webapp/i18n/et/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/et/reset.json.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/languages/templates/src/main/webapp/i18n/fa/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/fa/activate.json.ejs index ce3692783d5d..9efdc6f7508a 100644 --- a/generators/languages/templates/src/main/webapp/i18n/fa/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/fa/activate.json.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/languages/templates/src/main/webapp/i18n/fa/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/fa/global.json.ejs index 4da8bf36e8bc..a92d1214a2f9 100644 --- a/generators/languages/templates/src/main/webapp/i18n/fa/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/fa/global.json.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/languages/templates/src/main/webapp/i18n/fa/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/fa/health.json.ejs index 48c2b95ca346..5b53c77ed5f6 100644 --- a/generators/languages/templates/src/main/webapp/i18n/fa/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/fa/health.json.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/languages/templates/src/main/webapp/i18n/fa/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/fa/reset.json.ejs index 2b3e176fe13b..832a5aa86977 100644 --- a/generators/languages/templates/src/main/webapp/i18n/fa/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/fa/reset.json.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/languages/templates/src/main/webapp/i18n/fi/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/fi/activate.json.ejs index 9a9333a99687..76834c4dc92e 100644 --- a/generators/languages/templates/src/main/webapp/i18n/fi/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/fi/activate.json.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/languages/templates/src/main/webapp/i18n/fi/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/fi/global.json.ejs index 3c2331037721..30ad7eba498c 100644 --- a/generators/languages/templates/src/main/webapp/i18n/fi/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/fi/global.json.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/languages/templates/src/main/webapp/i18n/fi/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/fi/health.json.ejs index c7bf00e48091..5cfc4d20b9e9 100644 --- a/generators/languages/templates/src/main/webapp/i18n/fi/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/fi/health.json.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/languages/templates/src/main/webapp/i18n/fi/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/fi/reset.json.ejs index e03426a39561..f96461e29b3d 100644 --- a/generators/languages/templates/src/main/webapp/i18n/fi/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/fi/reset.json.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/languages/templates/src/main/webapp/i18n/fr/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/fr/activate.json.ejs index 69c25393c01d..2ff95520c232 100644 --- a/generators/languages/templates/src/main/webapp/i18n/fr/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/fr/activate.json.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/languages/templates/src/main/webapp/i18n/fr/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/fr/global.json.ejs index f25f5d2cf761..d7fe59406766 100644 --- a/generators/languages/templates/src/main/webapp/i18n/fr/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/fr/global.json.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/languages/templates/src/main/webapp/i18n/fr/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/fr/health.json.ejs index a43785107b1f..36687cc5d5bc 100644 --- a/generators/languages/templates/src/main/webapp/i18n/fr/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/fr/health.json.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/languages/templates/src/main/webapp/i18n/fr/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/fr/reset.json.ejs index 573b9079587f..a3f0b8ed7ba4 100644 --- a/generators/languages/templates/src/main/webapp/i18n/fr/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/fr/reset.json.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/languages/templates/src/main/webapp/i18n/gl/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/gl/activate.json.ejs index 161b11acc66c..0ec97f377431 100644 --- a/generators/languages/templates/src/main/webapp/i18n/gl/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/gl/activate.json.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/languages/templates/src/main/webapp/i18n/gl/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/gl/global.json.ejs index 83200bd02412..04e5d676b507 100644 --- a/generators/languages/templates/src/main/webapp/i18n/gl/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/gl/global.json.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/languages/templates/src/main/webapp/i18n/gl/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/gl/health.json.ejs index e02a287a67bc..857e55b75b16 100644 --- a/generators/languages/templates/src/main/webapp/i18n/gl/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/gl/health.json.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/languages/templates/src/main/webapp/i18n/gl/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/gl/reset.json.ejs index 8819f89d8ace..296d2526c466 100644 --- a/generators/languages/templates/src/main/webapp/i18n/gl/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/gl/reset.json.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/languages/templates/src/main/webapp/i18n/hi/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/hi/activate.json.ejs index e0e6167819c2..d74e3dcc8740 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hi/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/hi/activate.json.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/languages/templates/src/main/webapp/i18n/hi/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/hi/global.json.ejs index 8a5ab52b7319..6955130baa19 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hi/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/hi/global.json.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/languages/templates/src/main/webapp/i18n/hi/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/hi/health.json.ejs index 6bbeb06d9dd4..e9789793bd84 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hi/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/hi/health.json.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/languages/templates/src/main/webapp/i18n/hi/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/hi/reset.json.ejs index 7364d41a5a03..f938f085f8f0 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hi/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/hi/reset.json.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/languages/templates/src/main/webapp/i18n/hr/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/hr/activate.json.ejs index bc94c2b71c32..6f14ac57c352 100755 --- a/generators/languages/templates/src/main/webapp/i18n/hr/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/hr/activate.json.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/languages/templates/src/main/webapp/i18n/hr/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/hr/global.json.ejs index 00cdf74cc2ac..55dd9c1c539f 100755 --- a/generators/languages/templates/src/main/webapp/i18n/hr/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/hr/global.json.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/languages/templates/src/main/webapp/i18n/hr/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/hr/health.json.ejs index 788fb11d6d73..0e8551c570e4 100755 --- a/generators/languages/templates/src/main/webapp/i18n/hr/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/hr/health.json.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/languages/templates/src/main/webapp/i18n/hr/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/hr/reset.json.ejs index 36a5acb811a1..1eafdf2e1707 100755 --- a/generators/languages/templates/src/main/webapp/i18n/hr/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/hr/reset.json.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/languages/templates/src/main/webapp/i18n/hu/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/hu/activate.json.ejs index 06e06c20893b..d71c4c5930e7 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hu/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/hu/activate.json.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/languages/templates/src/main/webapp/i18n/hu/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/hu/global.json.ejs index 8985d2342d47..a9dc8d992e9d 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hu/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/hu/global.json.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/languages/templates/src/main/webapp/i18n/hu/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/hu/health.json.ejs index aab6c51e646d..73f0d25c9772 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hu/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/hu/health.json.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/languages/templates/src/main/webapp/i18n/hu/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/hu/reset.json.ejs index d851bb3e4450..a5aef95e4201 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hu/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/hu/reset.json.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/languages/templates/src/main/webapp/i18n/hy/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/hy/activate.json.ejs index 7328b076d125..f377c8fe63ff 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hy/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/hy/activate.json.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/languages/templates/src/main/webapp/i18n/hy/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/hy/global.json.ejs index fb9bf20076e3..63f816755fdb 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hy/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/hy/global.json.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/languages/templates/src/main/webapp/i18n/hy/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/hy/health.json.ejs index 5c657e8d1d5a..6ce5675b20a7 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hy/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/hy/health.json.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/languages/templates/src/main/webapp/i18n/hy/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/hy/reset.json.ejs index 198f0830201b..9f55971630d6 100644 --- a/generators/languages/templates/src/main/webapp/i18n/hy/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/hy/reset.json.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/languages/templates/src/main/webapp/i18n/in/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/in/activate.json.ejs index 1cef11290e47..e6475e7a0609 100644 --- a/generators/languages/templates/src/main/webapp/i18n/in/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/in/activate.json.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/languages/templates/src/main/webapp/i18n/in/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/in/global.json.ejs index 24d28e5d2267..612839d21f18 100644 --- a/generators/languages/templates/src/main/webapp/i18n/in/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/in/global.json.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/languages/templates/src/main/webapp/i18n/in/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/in/health.json.ejs index c454474557d8..d97cd273ce01 100644 --- a/generators/languages/templates/src/main/webapp/i18n/in/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/in/health.json.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/languages/templates/src/main/webapp/i18n/in/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/in/reset.json.ejs index 4dbc526ba1df..5a2ed526e530 100644 --- a/generators/languages/templates/src/main/webapp/i18n/in/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/in/reset.json.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/languages/templates/src/main/webapp/i18n/it/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/it/activate.json.ejs index e9b58f80bfb6..9315e3c736ec 100644 --- a/generators/languages/templates/src/main/webapp/i18n/it/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/it/activate.json.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/languages/templates/src/main/webapp/i18n/it/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/it/global.json.ejs index 9ae740117827..313f7b2d2b02 100644 --- a/generators/languages/templates/src/main/webapp/i18n/it/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/it/global.json.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/languages/templates/src/main/webapp/i18n/it/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/it/health.json.ejs index 35c2749cf038..ccbe07a8a460 100644 --- a/generators/languages/templates/src/main/webapp/i18n/it/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/it/health.json.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/languages/templates/src/main/webapp/i18n/it/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/it/reset.json.ejs index 7b7c3dc4d2b2..278fa44687ce 100644 --- a/generators/languages/templates/src/main/webapp/i18n/it/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/it/reset.json.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/languages/templates/src/main/webapp/i18n/ja/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ja/activate.json.ejs index f86ca43f21b5..c36f6fc9b23b 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ja/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ja/activate.json.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/languages/templates/src/main/webapp/i18n/ja/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ja/global.json.ejs index 31a93e5f4026..11e72c81ece4 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ja/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ja/global.json.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/languages/templates/src/main/webapp/i18n/ja/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ja/health.json.ejs index 06d69fc2dd7b..6e519d3f13ce 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ja/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ja/health.json.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/languages/templates/src/main/webapp/i18n/ja/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ja/reset.json.ejs index 23139bc91605..d46fe7c15eca 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ja/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ja/reset.json.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/languages/templates/src/main/webapp/i18n/ko/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ko/activate.json.ejs index 07d39c9496a9..66a52833bec5 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ko/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ko/activate.json.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/languages/templates/src/main/webapp/i18n/ko/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ko/global.json.ejs index 016c540b78bc..31fd23ff158c 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ko/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ko/global.json.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/languages/templates/src/main/webapp/i18n/ko/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ko/health.json.ejs index 4f3fdf3941dd..94018fd8f1c8 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ko/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ko/health.json.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/languages/templates/src/main/webapp/i18n/ko/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ko/reset.json.ejs index f970ef404c98..88cb572a5797 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ko/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ko/reset.json.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/languages/templates/src/main/webapp/i18n/mr/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/mr/activate.json.ejs index 246c2b6c0448..9b5e6208827d 100644 --- a/generators/languages/templates/src/main/webapp/i18n/mr/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/mr/activate.json.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/languages/templates/src/main/webapp/i18n/mr/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/mr/global.json.ejs index 59759a72c45f..b11d72d41733 100644 --- a/generators/languages/templates/src/main/webapp/i18n/mr/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/mr/global.json.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/languages/templates/src/main/webapp/i18n/mr/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/mr/health.json.ejs index 623a787ce833..47125f169ca8 100644 --- a/generators/languages/templates/src/main/webapp/i18n/mr/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/mr/health.json.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/languages/templates/src/main/webapp/i18n/mr/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/mr/reset.json.ejs index aa5c5cc4bbda..1246ee9c5549 100644 --- a/generators/languages/templates/src/main/webapp/i18n/mr/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/mr/reset.json.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/languages/templates/src/main/webapp/i18n/my/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/my/activate.json.ejs index f5f55282fb9a..ae033551ca3b 100644 --- a/generators/languages/templates/src/main/webapp/i18n/my/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/my/activate.json.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/languages/templates/src/main/webapp/i18n/my/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/my/global.json.ejs index ee5ba194b158..42120b78ae64 100644 --- a/generators/languages/templates/src/main/webapp/i18n/my/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/my/global.json.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/languages/templates/src/main/webapp/i18n/my/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/my/health.json.ejs index 1cd0a2fc7891..7df5cbe80c7f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/my/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/my/health.json.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/languages/templates/src/main/webapp/i18n/my/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/my/reset.json.ejs index 40ea3e7608e5..6b8fc81cfb11 100644 --- a/generators/languages/templates/src/main/webapp/i18n/my/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/my/reset.json.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/languages/templates/src/main/webapp/i18n/nl/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/nl/activate.json.ejs index a53d0bcab7e1..c0100fa45c3b 100644 --- a/generators/languages/templates/src/main/webapp/i18n/nl/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/nl/activate.json.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/languages/templates/src/main/webapp/i18n/nl/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/nl/global.json.ejs index ddace2f71557..076775e60992 100644 --- a/generators/languages/templates/src/main/webapp/i18n/nl/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/nl/global.json.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/languages/templates/src/main/webapp/i18n/nl/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/nl/health.json.ejs index 0229fcbe39d8..085cc823ec0d 100644 --- a/generators/languages/templates/src/main/webapp/i18n/nl/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/nl/health.json.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/languages/templates/src/main/webapp/i18n/nl/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/nl/reset.json.ejs index b6d36f623a54..6a12c918124b 100644 --- a/generators/languages/templates/src/main/webapp/i18n/nl/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/nl/reset.json.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/languages/templates/src/main/webapp/i18n/pl/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/pl/activate.json.ejs index 9f6cd99d8224..438e287984db 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pl/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/pl/activate.json.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/languages/templates/src/main/webapp/i18n/pl/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/pl/global.json.ejs index 50c2d628eb9f..83f8d440f2d9 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pl/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/pl/global.json.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/languages/templates/src/main/webapp/i18n/pl/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/pl/health.json.ejs index df5a025bf304..4b40df1d87c5 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pl/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/pl/health.json.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/languages/templates/src/main/webapp/i18n/pl/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/pl/reset.json.ejs index 5a62ec39fe10..6165746595ac 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pl/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/pl/reset.json.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/languages/templates/src/main/webapp/i18n/pt-br/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/pt-br/activate.json.ejs index dd83201b1767..c9daaa8b2206 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pt-br/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/pt-br/activate.json.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/languages/templates/src/main/webapp/i18n/pt-br/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/pt-br/global.json.ejs index cf6610ab481b..1edd460800ca 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pt-br/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/pt-br/global.json.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/languages/templates/src/main/webapp/i18n/pt-br/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/pt-br/health.json.ejs index 8adaf9531fac..e9174c6b1313 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pt-br/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/pt-br/health.json.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/languages/templates/src/main/webapp/i18n/pt-br/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/pt-br/reset.json.ejs index fe4a73502695..d7dc24f73bc7 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pt-br/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/pt-br/reset.json.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/languages/templates/src/main/webapp/i18n/pt-pt/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/pt-pt/activate.json.ejs index e038170d4edb..6f838d94cff3 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pt-pt/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/pt-pt/activate.json.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/languages/templates/src/main/webapp/i18n/pt-pt/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/pt-pt/global.json.ejs index 2d9a67657a40..ee8bdaef60fb 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pt-pt/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/pt-pt/global.json.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/languages/templates/src/main/webapp/i18n/pt-pt/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/pt-pt/health.json.ejs index 7162dbdffdd9..d23a1ceb6de5 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pt-pt/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/pt-pt/health.json.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/languages/templates/src/main/webapp/i18n/pt-pt/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/pt-pt/reset.json.ejs index 0d0275f5b2c0..11602edb2168 100644 --- a/generators/languages/templates/src/main/webapp/i18n/pt-pt/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/pt-pt/reset.json.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/languages/templates/src/main/webapp/i18n/ro/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ro/activate.json.ejs index de2aadea7a94..4bbd4b8a1b1d 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ro/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ro/activate.json.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/languages/templates/src/main/webapp/i18n/ro/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ro/global.json.ejs index 1e6e2be05777..420714a6f348 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ro/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ro/global.json.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/languages/templates/src/main/webapp/i18n/ro/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ro/health.json.ejs index 9d80422b4b9f..8f9b98f0fd4a 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ro/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ro/health.json.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/languages/templates/src/main/webapp/i18n/ro/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ro/reset.json.ejs index 8d1676531361..60baec5c6951 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ro/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ro/reset.json.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/languages/templates/src/main/webapp/i18n/ru/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ru/activate.json.ejs index f4b5f00c1825..1735f89d9d35 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ru/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ru/activate.json.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/languages/templates/src/main/webapp/i18n/ru/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ru/global.json.ejs index 8ece37237cbf..69931b3a1ffb 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ru/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ru/global.json.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/languages/templates/src/main/webapp/i18n/ru/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ru/health.json.ejs index 65351b62e9d9..304f11cde890 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ru/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ru/health.json.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/languages/templates/src/main/webapp/i18n/ru/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ru/reset.json.ejs index 2708ac3dc403..5881645ed794 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ru/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ru/reset.json.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/languages/templates/src/main/webapp/i18n/si/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/si/activate.json.ejs index f832651b68cf..bbec63b9b1ff 100644 --- a/generators/languages/templates/src/main/webapp/i18n/si/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/si/activate.json.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/languages/templates/src/main/webapp/i18n/si/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/si/global.json.ejs index 0e08fd09aaae..c5f3dc2c7977 100644 --- a/generators/languages/templates/src/main/webapp/i18n/si/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/si/global.json.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/languages/templates/src/main/webapp/i18n/si/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/si/health.json.ejs index 19d81515b762..ba9c6d8c3820 100644 --- a/generators/languages/templates/src/main/webapp/i18n/si/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/si/health.json.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/languages/templates/src/main/webapp/i18n/si/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/si/reset.json.ejs index e3aebb5fc43e..c646267d6301 100644 --- a/generators/languages/templates/src/main/webapp/i18n/si/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/si/reset.json.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/languages/templates/src/main/webapp/i18n/sk/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/sk/activate.json.ejs index 69064ced8b4d..8548e601a7ae 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sk/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/sk/activate.json.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/languages/templates/src/main/webapp/i18n/sk/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/sk/global.json.ejs index 2bc8df3e3b00..e233c65d8623 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sk/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/sk/global.json.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/languages/templates/src/main/webapp/i18n/sk/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/sk/health.json.ejs index 9c0f2ffe38c9..401fa6868069 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sk/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/sk/health.json.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/languages/templates/src/main/webapp/i18n/sk/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/sk/reset.json.ejs index ba8af20d9385..0c81a212f7c2 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sk/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/sk/reset.json.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/languages/templates/src/main/webapp/i18n/sr/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/sr/activate.json.ejs index 0f33b5fb89d5..76da380a149d 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sr/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/sr/activate.json.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/languages/templates/src/main/webapp/i18n/sr/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/sr/global.json.ejs index 0bbee11d91fe..91f6ddd6389f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sr/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/sr/global.json.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/languages/templates/src/main/webapp/i18n/sr/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/sr/health.json.ejs index d0689281ed69..5d319a03504b 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sr/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/sr/health.json.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/languages/templates/src/main/webapp/i18n/sr/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/sr/reset.json.ejs index 4cccf814b73e..544b1f332566 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sr/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/sr/reset.json.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/languages/templates/src/main/webapp/i18n/sv/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/sv/activate.json.ejs index 141113d7ce0f..d1de21f9f5da 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sv/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/sv/activate.json.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/languages/templates/src/main/webapp/i18n/sv/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/sv/global.json.ejs index 175609455eb2..a2c7b0953fd5 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sv/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/sv/global.json.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/languages/templates/src/main/webapp/i18n/sv/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/sv/health.json.ejs index 9b7c14c1c578..0d61a5cb9ad6 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sv/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/sv/health.json.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/languages/templates/src/main/webapp/i18n/sv/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/sv/reset.json.ejs index f863414c02fc..eb2f2159f1ac 100644 --- a/generators/languages/templates/src/main/webapp/i18n/sv/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/sv/reset.json.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/languages/templates/src/main/webapp/i18n/ta/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ta/activate.json.ejs index 5301d0ea06d2..41d3c2a12704 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ta/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ta/activate.json.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/languages/templates/src/main/webapp/i18n/ta/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ta/global.json.ejs index b6451526e714..20041191bdac 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ta/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ta/global.json.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/languages/templates/src/main/webapp/i18n/ta/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ta/health.json.ejs index a6aa8cae7e2e..9fa8a466f7fe 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ta/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ta/health.json.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/languages/templates/src/main/webapp/i18n/ta/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ta/reset.json.ejs index 2e9cc07e796f..1936d9889636 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ta/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ta/reset.json.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/languages/templates/src/main/webapp/i18n/te/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/te/activate.json.ejs index 17b6fd6f78fd..ce88643093fc 100644 --- a/generators/languages/templates/src/main/webapp/i18n/te/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/te/activate.json.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/languages/templates/src/main/webapp/i18n/te/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/te/global.json.ejs index 4a5d26c4e973..6f79cb27179b 100644 --- a/generators/languages/templates/src/main/webapp/i18n/te/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/te/global.json.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/languages/templates/src/main/webapp/i18n/te/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/te/health.json.ejs index 1cd0a2fc7891..7df5cbe80c7f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/te/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/te/health.json.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/languages/templates/src/main/webapp/i18n/te/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/te/reset.json.ejs index 1b899d497150..b5a08c17fd1b 100644 --- a/generators/languages/templates/src/main/webapp/i18n/te/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/te/reset.json.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/languages/templates/src/main/webapp/i18n/th/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/th/activate.json.ejs index 4fba38b04257..c853f83f17ea 100644 --- a/generators/languages/templates/src/main/webapp/i18n/th/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/th/activate.json.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/languages/templates/src/main/webapp/i18n/th/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/th/global.json.ejs index 54c3f3dfbaef..51714aa72983 100644 --- a/generators/languages/templates/src/main/webapp/i18n/th/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/th/global.json.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/languages/templates/src/main/webapp/i18n/th/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/th/health.json.ejs index 8f325bad89d8..c7a11c453559 100644 --- a/generators/languages/templates/src/main/webapp/i18n/th/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/th/health.json.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/languages/templates/src/main/webapp/i18n/th/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/th/reset.json.ejs index 88a0ae3ca571..991b12185bbd 100644 --- a/generators/languages/templates/src/main/webapp/i18n/th/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/th/reset.json.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/languages/templates/src/main/webapp/i18n/tr/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/tr/activate.json.ejs index 5c5f94df2897..a70062a30a46 100644 --- a/generators/languages/templates/src/main/webapp/i18n/tr/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/tr/activate.json.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/languages/templates/src/main/webapp/i18n/tr/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/tr/global.json.ejs index 572df5b5b69e..78c72d160dad 100644 --- a/generators/languages/templates/src/main/webapp/i18n/tr/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/tr/global.json.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/languages/templates/src/main/webapp/i18n/tr/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/tr/health.json.ejs index 47fa727da7b9..a5806aa7c296 100644 --- a/generators/languages/templates/src/main/webapp/i18n/tr/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/tr/health.json.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/languages/templates/src/main/webapp/i18n/tr/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/tr/reset.json.ejs index cf3b3046291b..4bff882fd74f 100644 --- a/generators/languages/templates/src/main/webapp/i18n/tr/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/tr/reset.json.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/languages/templates/src/main/webapp/i18n/ua/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ua/activate.json.ejs index 1bbce3e78570..6092586f6389 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ua/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ua/activate.json.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/languages/templates/src/main/webapp/i18n/ua/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ua/global.json.ejs index 0e1aa62d7d45..a2801091b6bb 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ua/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ua/global.json.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/languages/templates/src/main/webapp/i18n/ua/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ua/health.json.ejs index cb6c0ad1245a..356e11c62738 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ua/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ua/health.json.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/languages/templates/src/main/webapp/i18n/ua/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/ua/reset.json.ejs index 37a3b60a887d..ff2b56c558ee 100644 --- a/generators/languages/templates/src/main/webapp/i18n/ua/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/ua/reset.json.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/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/activate.json.ejs index aea68452d6cb..74b4128f50cb 100644 --- a/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/activate.json.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/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/global.json.ejs index 8ef0a19d32c2..fe25fd7a69f4 100644 --- a/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/global.json.ejs @@ -1,11 +1,15 @@ <%# - Copyright 2013-2018 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. + 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"); 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, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/health.json.ejs index 9488b4ff410b..d14c4ce9b8f2 100644 --- a/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/health.json.ejs @@ -1,11 +1,15 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. + 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"); 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, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/reset.json.ejs index d8072b416f07..dbd40939b274 100644 --- a/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/reset.json.ejs @@ -1,11 +1,15 @@ <%# - Copyright 2013-2018 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. + 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"); 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, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/activate.json.ejs index 3920c60598c2..a4fe50728e32 100644 --- a/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/activate.json.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/languages/templates/src/main/webapp/i18n/uz-Latn-uz/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/global.json.ejs index f15bfa9b9f86..738d0d0a0f90 100644 --- a/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/global.json.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/languages/templates/src/main/webapp/i18n/uz-Latn-uz/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/health.json.ejs index 729890012544..0afa7d158587 100644 --- a/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/health.json.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/languages/templates/src/main/webapp/i18n/uz-Latn-uz/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/reset.json.ejs index 11a74abe2a14..bd78bb8c95f4 100644 --- a/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/reset.json.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/languages/templates/src/main/webapp/i18n/vi/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/vi/activate.json.ejs index 418a571596c1..a1f38d72fa4d 100644 --- a/generators/languages/templates/src/main/webapp/i18n/vi/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/vi/activate.json.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/languages/templates/src/main/webapp/i18n/vi/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/vi/global.json.ejs index b0e2a3120901..795061658f55 100644 --- a/generators/languages/templates/src/main/webapp/i18n/vi/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/vi/global.json.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/languages/templates/src/main/webapp/i18n/vi/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/vi/health.json.ejs index cc8fb8dd05e2..ad772c6f25e0 100644 --- a/generators/languages/templates/src/main/webapp/i18n/vi/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/vi/health.json.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/languages/templates/src/main/webapp/i18n/vi/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/vi/reset.json.ejs index 2a7093266671..ab25483104aa 100644 --- a/generators/languages/templates/src/main/webapp/i18n/vi/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/vi/reset.json.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/languages/templates/src/main/webapp/i18n/zh-cn/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/zh-cn/activate.json.ejs index d9cbb298e6ab..3b6ae3cda6b3 100644 --- a/generators/languages/templates/src/main/webapp/i18n/zh-cn/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/zh-cn/activate.json.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/languages/templates/src/main/webapp/i18n/zh-cn/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/zh-cn/global.json.ejs index 5d9facbe7d1e..73da7bfbaa47 100644 --- a/generators/languages/templates/src/main/webapp/i18n/zh-cn/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/zh-cn/global.json.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/languages/templates/src/main/webapp/i18n/zh-cn/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/zh-cn/health.json.ejs index 291656906de3..1c9d7e146979 100644 --- a/generators/languages/templates/src/main/webapp/i18n/zh-cn/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/zh-cn/health.json.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/languages/templates/src/main/webapp/i18n/zh-cn/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/zh-cn/reset.json.ejs index 5c5bdd3b5bd6..fc34c2efc6e1 100644 --- a/generators/languages/templates/src/main/webapp/i18n/zh-cn/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/zh-cn/reset.json.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/languages/templates/src/main/webapp/i18n/zh-tw/activate.json.ejs b/generators/languages/templates/src/main/webapp/i18n/zh-tw/activate.json.ejs index 5130a5b26e10..fcabeef2b792 100644 --- a/generators/languages/templates/src/main/webapp/i18n/zh-tw/activate.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/zh-tw/activate.json.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/languages/templates/src/main/webapp/i18n/zh-tw/global.json.ejs b/generators/languages/templates/src/main/webapp/i18n/zh-tw/global.json.ejs index 94cb169eb795..198f2b1871a1 100644 --- a/generators/languages/templates/src/main/webapp/i18n/zh-tw/global.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/zh-tw/global.json.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/languages/templates/src/main/webapp/i18n/zh-tw/health.json.ejs b/generators/languages/templates/src/main/webapp/i18n/zh-tw/health.json.ejs index dfe25ae355b1..e04b79165d85 100644 --- a/generators/languages/templates/src/main/webapp/i18n/zh-tw/health.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/zh-tw/health.json.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/languages/templates/src/main/webapp/i18n/zh-tw/reset.json.ejs b/generators/languages/templates/src/main/webapp/i18n/zh-tw/reset.json.ejs index 0d45d4eee262..4294a4dda772 100644 --- a/generators/languages/templates/src/main/webapp/i18n/zh-tw/reset.json.ejs +++ b/generators/languages/templates/src/main/webapp/i18n/zh-tw/reset.json.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/needle-api.js b/generators/needle-api.js index 2de732aec739..86679f8dc37e 100644 --- a/generators/needle-api.js +++ b/generators/needle-api.js @@ -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/needle-base.js b/generators/needle-base.js index 82c4351422c4..0192c96f379e 100644 --- a/generators/needle-base.js +++ b/generators/needle-base.js @@ -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/openapi-client/files.js b/generators/openapi-client/files.js index 11302a182ff3..a47be71c311e 100644 --- a/generators/openapi-client/files.js +++ b/generators/openapi-client/files.js @@ -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/openapi-client/index.js b/generators/openapi-client/index.js index 1ae031c7415c..19fba2508105 100644 --- a/generators/openapi-client/index.js +++ b/generators/openapi-client/index.js @@ -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/openapi-client/prompts.js b/generators/openapi-client/prompts.js index a676e2f819e3..0d3b96a193d3 100644 --- a/generators/openapi-client/prompts.js +++ b/generators/openapi-client/prompts.js @@ -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/openshift/files.js b/generators/openshift/files.js index abe01b088eee..5d7da32386ce 100644 --- a/generators/openshift/files.js +++ b/generators/openshift/files.js @@ -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/openshift/index.js b/generators/openshift/index.js index 3346c5e9f7b7..df778e356996 100644 --- a/generators/openshift/index.js +++ b/generators/openshift/index.js @@ -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/openshift/prompts.js b/generators/openshift/prompts.js index 28d92066604c..812b0c9e3a3b 100644 --- a/generators/openshift/prompts.js +++ b/generators/openshift/prompts.js @@ -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/openshift/templates/apply.sh.ejs b/generators/openshift/templates/apply.sh.ejs index 18aa0742b4a5..48feacdd18f2 100644 --- a/generators/openshift/templates/apply.sh.ejs +++ b/generators/openshift/templates/apply.sh.ejs @@ -9,7 +9,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/openshift/templates/db/cassandra.yml.ejs b/generators/openshift/templates/db/cassandra.yml.ejs index fbd31af6c882..1bac0a771892 100644 --- a/generators/openshift/templates/db/cassandra.yml.ejs +++ b/generators/openshift/templates/db/cassandra.yml.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/openshift/templates/db/couchbase.yml.ejs b/generators/openshift/templates/db/couchbase.yml.ejs index cb6e2dbc3ca7..192ace6b8c7d 100644 --- a/generators/openshift/templates/db/couchbase.yml.ejs +++ b/generators/openshift/templates/db/couchbase.yml.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/openshift/templates/db/elasticsearch.yml.ejs b/generators/openshift/templates/db/elasticsearch.yml.ejs index cd20f057d762..7e37d89c27d4 100644 --- a/generators/openshift/templates/db/elasticsearch.yml.ejs +++ b/generators/openshift/templates/db/elasticsearch.yml.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/openshift/templates/db/mariadb.yml.ejs b/generators/openshift/templates/db/mariadb.yml.ejs index 7f12bcd7b273..cad3729f76e8 100644 --- a/generators/openshift/templates/db/mariadb.yml.ejs +++ b/generators/openshift/templates/db/mariadb.yml.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/openshift/templates/db/mongodb.yml.ejs b/generators/openshift/templates/db/mongodb.yml.ejs index a0148fb77efd..08db6ee55877 100644 --- a/generators/openshift/templates/db/mongodb.yml.ejs +++ b/generators/openshift/templates/db/mongodb.yml.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/openshift/templates/db/mysql.yml.ejs b/generators/openshift/templates/db/mysql.yml.ejs index 9b99bf0c356b..cb027214aa98 100644 --- a/generators/openshift/templates/db/mysql.yml.ejs +++ b/generators/openshift/templates/db/mysql.yml.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/openshift/templates/db/postgresql.yml.ejs b/generators/openshift/templates/db/postgresql.yml.ejs index 06f879c53ffc..3283926ab407 100644 --- a/generators/openshift/templates/db/postgresql.yml.ejs +++ b/generators/openshift/templates/db/postgresql.yml.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/openshift/templates/deployment.yml.ejs b/generators/openshift/templates/deployment.yml.ejs index a79c50714275..5a693756e3f5 100644 --- a/generators/openshift/templates/deployment.yml.ejs +++ b/generators/openshift/templates/deployment.yml.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/openshift/templates/messagebroker/kafka.yml.ejs b/generators/openshift/templates/messagebroker/kafka.yml.ejs index 25fc0f6ad86b..c6286910f2b0 100644 --- a/generators/openshift/templates/messagebroker/kafka.yml.ejs +++ b/generators/openshift/templates/messagebroker/kafka.yml.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/openshift/templates/monitoring/jhipster-metrics.yml.ejs b/generators/openshift/templates/monitoring/jhipster-metrics.yml.ejs index d7da3ceb2176..4713d2dece9a 100644 --- a/generators/openshift/templates/monitoring/jhipster-metrics.yml.ejs +++ b/generators/openshift/templates/monitoring/jhipster-metrics.yml.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/openshift/templates/registry/application-configmap.yml.ejs b/generators/openshift/templates/registry/application-configmap.yml.ejs index b0f33667a9c8..3ae097dad9e7 100644 --- a/generators/openshift/templates/registry/application-configmap.yml.ejs +++ b/generators/openshift/templates/registry/application-configmap.yml.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/openshift/templates/registry/consul.yml.ejs b/generators/openshift/templates/registry/consul.yml.ejs index c54abf1c1be0..e591ce655fb2 100644 --- a/generators/openshift/templates/registry/consul.yml.ejs +++ b/generators/openshift/templates/registry/consul.yml.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/openshift/templates/registry/jhipster-registry.yml.ejs b/generators/openshift/templates/registry/jhipster-registry.yml.ejs index 161e96b29d47..6783be001e66 100644 --- a/generators/openshift/templates/registry/jhipster-registry.yml.ejs +++ b/generators/openshift/templates/registry/jhipster-registry.yml.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/openshift/templates/scc/scc-config.yml.ejs b/generators/openshift/templates/scc/scc-config.yml.ejs index 7174c265de68..3ca5e44fc950 100644 --- a/generators/openshift/templates/scc/scc-config.yml.ejs +++ b/generators/openshift/templates/scc/scc-config.yml.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/page/files-vue.js b/generators/page/files-vue.js index 5e963cb3f7c9..1e8bdef8ba72 100644 --- a/generators/page/files-vue.js +++ b/generators/page/files-vue.js @@ -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/page/index.js b/generators/page/index.js index 6be1684516f5..dc34ff50131b 100644 --- a/generators/page/index.js +++ b/generators/page/index.js @@ -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/page/prompts.js b/generators/page/prompts.js index cfba3de44633..4e47d1b0d1db 100644 --- a/generators/page/prompts.js +++ b/generators/page/prompts.js @@ -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/page/templates/vue/src/test/javascript/e2e/pages/page.page-object.ts.ejs b/generators/page/templates/vue/src/test/javascript/e2e/pages/page.page-object.ts.ejs index df31cbb6d87f..c4254429423b 100644 --- a/generators/page/templates/vue/src/test/javascript/e2e/pages/page.page-object.ts.ejs +++ b/generators/page/templates/vue/src/test/javascript/e2e/pages/page.page-object.ts.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/page/templates/vue/src/test/javascript/e2e/pages/page.spec.ts.ejs b/generators/page/templates/vue/src/test/javascript/e2e/pages/page.spec.ts.ejs index 9a94ba8e9fab..54c7640ff618 100644 --- a/generators/page/templates/vue/src/test/javascript/e2e/pages/page.spec.ts.ejs +++ b/generators/page/templates/vue/src/test/javascript/e2e/pages/page.spec.ts.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/page/templates/vue/src/test/javascript/spec/app/pages/page.component.spec.ts.ejs b/generators/page/templates/vue/src/test/javascript/spec/app/pages/page.component.spec.ts.ejs index 1d8ca0e4d55f..57dedb80ee07 100644 --- a/generators/page/templates/vue/src/test/javascript/spec/app/pages/page.component.spec.ts.ejs +++ b/generators/page/templates/vue/src/test/javascript/spec/app/pages/page.component.spec.ts.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/page/templates/vue/src/test/javascript/spec/app/pages/page.service.spec.ts.ejs b/generators/page/templates/vue/src/test/javascript/spec/app/pages/page.service.spec.ts.ejs index e79ac11e14d8..a373f3766fa2 100644 --- a/generators/page/templates/vue/src/test/javascript/spec/app/pages/page.service.spec.ts.ejs +++ b/generators/page/templates/vue/src/test/javascript/spec/app/pages/page.service.spec.ts.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/server/files.js b/generators/server/files.js index cad2d8ae677f..6cffc82b7163 100644 --- a/generators/server/files.js +++ b/generators/server/files.js @@ -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/server/index.js b/generators/server/index.js index 7fd934c9165b..26bfc79d3601 100644 --- a/generators/server/index.js +++ b/generators/server/index.js @@ -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/server/needle-api/needle-server-cache.js b/generators/server/needle-api/needle-server-cache.js index 911e7e2b90c0..90ee05609ada 100644 --- a/generators/server/needle-api/needle-server-cache.js +++ b/generators/server/needle-api/needle-server-cache.js @@ -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/server/needle-api/needle-server-gradle.js b/generators/server/needle-api/needle-server-gradle.js index a67bf6fbefd8..d92310e660e5 100644 --- a/generators/server/needle-api/needle-server-gradle.js +++ b/generators/server/needle-api/needle-server-gradle.js @@ -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/server/needle-api/needle-server-liquibase.js b/generators/server/needle-api/needle-server-liquibase.js index 2c5c05186ee6..c70f5237b562 100644 --- a/generators/server/needle-api/needle-server-liquibase.js +++ b/generators/server/needle-api/needle-server-liquibase.js @@ -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/server/needle-api/needle-server-logback-spring.js b/generators/server/needle-api/needle-server-logback-spring.js index ceface824e72..c2a851fcefdc 100644 --- a/generators/server/needle-api/needle-server-logback-spring.js +++ b/generators/server/needle-api/needle-server-logback-spring.js @@ -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/server/needle-api/needle-server-maven.js b/generators/server/needle-api/needle-server-maven.js index 6fece0c38373..1051ca4c5a98 100644 --- a/generators/server/needle-api/needle-server-maven.js +++ b/generators/server/needle-api/needle-server-maven.js @@ -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/server/needle-api/needle-server.js b/generators/server/needle-api/needle-server.js index 8f374e77ccd9..8731d5d318a0 100644 --- a/generators/server/needle-api/needle-server.js +++ b/generators/server/needle-api/needle-server.js @@ -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/server/prompts.js b/generators/server/prompts.js index 525fc4499e12..65ca1eb159fe 100644 --- a/generators/server/prompts.js +++ b/generators/server/prompts.js @@ -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/server/templates/build.gradle.ejs b/generators/server/templates/build.gradle.ejs index e511254c8733..bc5ad23ee99e 100644 --- a/generators/server/templates/build.gradle.ejs +++ b/generators/server/templates/build.gradle.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/server/templates/checkstyle.xml.ejs b/generators/server/templates/checkstyle.xml.ejs index 7a0e41df5c9a..2f17ca851d69 100644 --- a/generators/server/templates/checkstyle.xml.ejs +++ b/generators/server/templates/checkstyle.xml.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/server/templates/gradle.properties.ejs b/generators/server/templates/gradle.properties.ejs index d0b45ba75cab..a5f129883386 100644 --- a/generators/server/templates/gradle.properties.ejs +++ b/generators/server/templates/gradle.properties.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/server/templates/gradle/docker.gradle.ejs b/generators/server/templates/gradle/docker.gradle.ejs index e4f97474351e..4a141f50bc8a 100644 --- a/generators/server/templates/gradle/docker.gradle.ejs +++ b/generators/server/templates/gradle/docker.gradle.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/server/templates/gradle/profile_dev.gradle.ejs b/generators/server/templates/gradle/profile_dev.gradle.ejs index 0b45a5d5bdea..6da17fd3c568 100644 --- a/generators/server/templates/gradle/profile_dev.gradle.ejs +++ b/generators/server/templates/gradle/profile_dev.gradle.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/server/templates/gradle/profile_prod.gradle.ejs b/generators/server/templates/gradle/profile_prod.gradle.ejs index e9b40ea3e6bd..57906596555f 100644 --- a/generators/server/templates/gradle/profile_prod.gradle.ejs +++ b/generators/server/templates/gradle/profile_prod.gradle.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/server/templates/gradle/sonar.gradle.ejs b/generators/server/templates/gradle/sonar.gradle.ejs index c9913776453d..a232854001e1 100644 --- a/generators/server/templates/gradle/sonar.gradle.ejs +++ b/generators/server/templates/gradle/sonar.gradle.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/server/templates/gradle/swagger.gradle.ejs b/generators/server/templates/gradle/swagger.gradle.ejs index 3226c21f7e67..bb93c336b695 100644 --- a/generators/server/templates/gradle/swagger.gradle.ejs +++ b/generators/server/templates/gradle/swagger.gradle.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/server/templates/gradle/war.gradle.ejs b/generators/server/templates/gradle/war.gradle.ejs index 33347f3c42ff..da78560ddfaa 100644 --- a/generators/server/templates/gradle/war.gradle.ejs +++ b/generators/server/templates/gradle/war.gradle.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/server/templates/gradle/zipkin.gradle.ejs b/generators/server/templates/gradle/zipkin.gradle.ejs index 20a77986617e..b8bece69bd34 100644 --- a/generators/server/templates/gradle/zipkin.gradle.ejs +++ b/generators/server/templates/gradle/zipkin.gradle.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/server/templates/package.json.ejs b/generators/server/templates/package.json.ejs index edd5d671b111..7b44c4196970 100644 --- a/generators/server/templates/package.json.ejs +++ b/generators/server/templates/package.json.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/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs index 1956524cf487..2d7ee70119bb 100644 --- a/generators/server/templates/pom.xml.ejs +++ b/generators/server/templates/pom.xml.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/server/templates/settings.gradle.ejs b/generators/server/templates/settings.gradle.ejs index 660d190a4503..37797ee28193 100644 --- a/generators/server/templates/settings.gradle.ejs +++ b/generators/server/templates/settings.gradle.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/server/templates/src/main/docker/app.yml.ejs b/generators/server/templates/src/main/docker/app.yml.ejs index 443f6f6ca5c7..b6b5a7523048 100644 --- a/generators/server/templates/src/main/docker/app.yml.ejs +++ b/generators/server/templates/src/main/docker/app.yml.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/server/templates/src/main/docker/cassandra-cluster.yml.ejs b/generators/server/templates/src/main/docker/cassandra-cluster.yml.ejs index ef2b1e4e51f6..2a7f0d425027 100644 --- a/generators/server/templates/src/main/docker/cassandra-cluster.yml.ejs +++ b/generators/server/templates/src/main/docker/cassandra-cluster.yml.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/server/templates/src/main/docker/cassandra-migration.yml.ejs b/generators/server/templates/src/main/docker/cassandra-migration.yml.ejs index 3e4a4c0afea8..fc061373bb22 100644 --- a/generators/server/templates/src/main/docker/cassandra-migration.yml.ejs +++ b/generators/server/templates/src/main/docker/cassandra-migration.yml.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/server/templates/src/main/docker/cassandra.yml.ejs b/generators/server/templates/src/main/docker/cassandra.yml.ejs index 1435dacc9da0..6a03be4247f2 100644 --- a/generators/server/templates/src/main/docker/cassandra.yml.ejs +++ b/generators/server/templates/src/main/docker/cassandra.yml.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/server/templates/src/main/docker/cassandra/Cassandra-Migration.Dockerfile.ejs b/generators/server/templates/src/main/docker/cassandra/Cassandra-Migration.Dockerfile.ejs index a6198dcd13c1..ed5256842123 100644 --- a/generators/server/templates/src/main/docker/cassandra/Cassandra-Migration.Dockerfile.ejs +++ b/generators/server/templates/src/main/docker/cassandra/Cassandra-Migration.Dockerfile.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/server/templates/src/main/docker/cassandra/scripts/autoMigrate.sh.ejs b/generators/server/templates/src/main/docker/cassandra/scripts/autoMigrate.sh.ejs index 8d11ff895a5a..cbb4e68a55b1 100644 --- a/generators/server/templates/src/main/docker/cassandra/scripts/autoMigrate.sh.ejs +++ b/generators/server/templates/src/main/docker/cassandra/scripts/autoMigrate.sh.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/server/templates/src/main/docker/cassandra/scripts/execute-cql.sh.ejs b/generators/server/templates/src/main/docker/cassandra/scripts/execute-cql.sh.ejs index 6d8fb701e0a6..a7c541ca6c0b 100644 --- a/generators/server/templates/src/main/docker/cassandra/scripts/execute-cql.sh.ejs +++ b/generators/server/templates/src/main/docker/cassandra/scripts/execute-cql.sh.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/server/templates/src/main/docker/config/README.md.ejs b/generators/server/templates/src/main/docker/config/README.md.ejs index b12df04a9b07..64d45a32e6ab 100644 --- a/generators/server/templates/src/main/docker/config/README.md.ejs +++ b/generators/server/templates/src/main/docker/config/README.md.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/server/templates/src/main/docker/consul.yml.ejs b/generators/server/templates/src/main/docker/consul.yml.ejs index 8a73478220ad..4753223542fa 100644 --- a/generators/server/templates/src/main/docker/consul.yml.ejs +++ b/generators/server/templates/src/main/docker/consul.yml.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/server/templates/src/main/docker/couchbase-cluster.yml.ejs b/generators/server/templates/src/main/docker/couchbase-cluster.yml.ejs index 4b34273bc4ab..cf0282739933 100644 --- a/generators/server/templates/src/main/docker/couchbase-cluster.yml.ejs +++ b/generators/server/templates/src/main/docker/couchbase-cluster.yml.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/server/templates/src/main/docker/couchbase.yml.ejs b/generators/server/templates/src/main/docker/couchbase.yml.ejs index bc2808a39438..23afc9673868 100644 --- a/generators/server/templates/src/main/docker/couchbase.yml.ejs +++ b/generators/server/templates/src/main/docker/couchbase.yml.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/server/templates/src/main/docker/elasticsearch.yml.ejs b/generators/server/templates/src/main/docker/elasticsearch.yml.ejs index 881afaa88930..2e1e149397d3 100644 --- a/generators/server/templates/src/main/docker/elasticsearch.yml.ejs +++ b/generators/server/templates/src/main/docker/elasticsearch.yml.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/server/templates/src/main/docker/grafana/provisioning/dashboards/JVM.json.ejs b/generators/server/templates/src/main/docker/grafana/provisioning/dashboards/JVM.json.ejs index 966101d61d40..5b8710c725d2 100644 --- a/generators/server/templates/src/main/docker/grafana/provisioning/dashboards/JVM.json.ejs +++ b/generators/server/templates/src/main/docker/grafana/provisioning/dashboards/JVM.json.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/server/templates/src/main/docker/grafana/provisioning/dashboards/dashboard.yml.ejs b/generators/server/templates/src/main/docker/grafana/provisioning/dashboards/dashboard.yml.ejs index 18442b96fc84..65106d6aede2 100644 --- a/generators/server/templates/src/main/docker/grafana/provisioning/dashboards/dashboard.yml.ejs +++ b/generators/server/templates/src/main/docker/grafana/provisioning/dashboards/dashboard.yml.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/server/templates/src/main/docker/grafana/provisioning/datasources/datasource.yml.ejs b/generators/server/templates/src/main/docker/grafana/provisioning/datasources/datasource.yml.ejs index 35840bb271ac..90107604058e 100644 --- a/generators/server/templates/src/main/docker/grafana/provisioning/datasources/datasource.yml.ejs +++ b/generators/server/templates/src/main/docker/grafana/provisioning/datasources/datasource.yml.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/server/templates/src/main/docker/hazelcast-management-center.yml.ejs b/generators/server/templates/src/main/docker/hazelcast-management-center.yml.ejs index 590c55b9f6f3..aae04532b071 100644 --- a/generators/server/templates/src/main/docker/hazelcast-management-center.yml.ejs +++ b/generators/server/templates/src/main/docker/hazelcast-management-center.yml.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/server/templates/src/main/docker/jhipster-control-center.yml.ejs b/generators/server/templates/src/main/docker/jhipster-control-center.yml.ejs index 6613a6c1c8f5..c5724e189f17 100644 --- a/generators/server/templates/src/main/docker/jhipster-control-center.yml.ejs +++ b/generators/server/templates/src/main/docker/jhipster-control-center.yml.ejs @@ -1,20 +1,20 @@ <%# -Copyright 2013-2020 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. -This file is part of the JHipster project, see https://www.jhipster.tech/ -for more information. + 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"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + 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, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -%> ## How to use JHCC docker compose # To allow JHCC to reach JHipster application from a docker container note that we set the host as host.docker.internal diff --git a/generators/server/templates/src/main/docker/jhipster-registry.yml.ejs b/generators/server/templates/src/main/docker/jhipster-registry.yml.ejs index 657c5a347022..a8ec66d8510c 100644 --- a/generators/server/templates/src/main/docker/jhipster-registry.yml.ejs +++ b/generators/server/templates/src/main/docker/jhipster-registry.yml.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/server/templates/src/main/docker/kafka.yml.ejs b/generators/server/templates/src/main/docker/kafka.yml.ejs index 743c59ab929f..d764c9fe1af8 100644 --- a/generators/server/templates/src/main/docker/kafka.yml.ejs +++ b/generators/server/templates/src/main/docker/kafka.yml.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/server/templates/src/main/docker/keycloak.yml.ejs b/generators/server/templates/src/main/docker/keycloak.yml.ejs index a7491dad4710..2c87f76ef18c 100644 --- a/generators/server/templates/src/main/docker/keycloak.yml.ejs +++ b/generators/server/templates/src/main/docker/keycloak.yml.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/server/templates/src/main/docker/mariadb.yml.ejs b/generators/server/templates/src/main/docker/mariadb.yml.ejs index 0120df1419e8..c73c77963753 100644 --- a/generators/server/templates/src/main/docker/mariadb.yml.ejs +++ b/generators/server/templates/src/main/docker/mariadb.yml.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/server/templates/src/main/docker/memcached.yml.ejs b/generators/server/templates/src/main/docker/memcached.yml.ejs index 5e3328e46c73..afbde754b8a4 100644 --- a/generators/server/templates/src/main/docker/memcached.yml.ejs +++ b/generators/server/templates/src/main/docker/memcached.yml.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/server/templates/src/main/docker/mongodb-cluster.yml.ejs b/generators/server/templates/src/main/docker/mongodb-cluster.yml.ejs index 03aa2b2f41b0..0bf0948038d3 100644 --- a/generators/server/templates/src/main/docker/mongodb-cluster.yml.ejs +++ b/generators/server/templates/src/main/docker/mongodb-cluster.yml.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/server/templates/src/main/docker/mongodb.yml.ejs b/generators/server/templates/src/main/docker/mongodb.yml.ejs index 778da6f18ade..530a455fed25 100644 --- a/generators/server/templates/src/main/docker/mongodb.yml.ejs +++ b/generators/server/templates/src/main/docker/mongodb.yml.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/server/templates/src/main/docker/monitoring.yml.ejs b/generators/server/templates/src/main/docker/monitoring.yml.ejs index f20ea0f81a48..31f719f16662 100644 --- a/generators/server/templates/src/main/docker/monitoring.yml.ejs +++ b/generators/server/templates/src/main/docker/monitoring.yml.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/server/templates/src/main/docker/mssql.yml.ejs b/generators/server/templates/src/main/docker/mssql.yml.ejs index 8d0933d816e2..99af8fe9bf4d 100644 --- a/generators/server/templates/src/main/docker/mssql.yml.ejs +++ b/generators/server/templates/src/main/docker/mssql.yml.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/server/templates/src/main/docker/mysql.yml.ejs b/generators/server/templates/src/main/docker/mysql.yml.ejs index 51e0e3bfd6de..b7b990db6e6f 100644 --- a/generators/server/templates/src/main/docker/mysql.yml.ejs +++ b/generators/server/templates/src/main/docker/mysql.yml.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/server/templates/src/main/docker/neo4j.yml.ejs b/generators/server/templates/src/main/docker/neo4j.yml.ejs index dc5c2cb2c32d..4d857ea60e2d 100644 --- a/generators/server/templates/src/main/docker/neo4j.yml.ejs +++ b/generators/server/templates/src/main/docker/neo4j.yml.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/server/templates/src/main/docker/postgresql.yml.ejs b/generators/server/templates/src/main/docker/postgresql.yml.ejs index bcc47736cc94..f3a21adf4430 100644 --- a/generators/server/templates/src/main/docker/postgresql.yml.ejs +++ b/generators/server/templates/src/main/docker/postgresql.yml.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/server/templates/src/main/docker/prometheus/prometheus.yml.ejs b/generators/server/templates/src/main/docker/prometheus/prometheus.yml.ejs index a415b0a7c57a..3af43151a631 100644 --- a/generators/server/templates/src/main/docker/prometheus/prometheus.yml.ejs +++ b/generators/server/templates/src/main/docker/prometheus/prometheus.yml.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/server/templates/src/main/docker/redis-cluster.yml.ejs b/generators/server/templates/src/main/docker/redis-cluster.yml.ejs index 2730a1778cf1..7a0e6e759031 100644 --- a/generators/server/templates/src/main/docker/redis-cluster.yml.ejs +++ b/generators/server/templates/src/main/docker/redis-cluster.yml.ejs @@ -1,11 +1,15 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. + 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"); 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, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/generators/server/templates/src/main/docker/redis.yml.ejs b/generators/server/templates/src/main/docker/redis.yml.ejs index 9adbd6f34e6a..adc08292146c 100644 --- a/generators/server/templates/src/main/docker/redis.yml.ejs +++ b/generators/server/templates/src/main/docker/redis.yml.ejs @@ -1,11 +1,15 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. + 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"); 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, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/generators/server/templates/src/main/docker/sonar.yml.ejs b/generators/server/templates/src/main/docker/sonar.yml.ejs index b09e76a04f5c..632d0035cac0 100644 --- a/generators/server/templates/src/main/docker/sonar.yml.ejs +++ b/generators/server/templates/src/main/docker/sonar.yml.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/server/templates/src/main/docker/swagger-editor.yml.ejs b/generators/server/templates/src/main/docker/swagger-editor.yml.ejs index fa8351d7826b..7b1c380d78fa 100644 --- a/generators/server/templates/src/main/docker/swagger-editor.yml.ejs +++ b/generators/server/templates/src/main/docker/swagger-editor.yml.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/server/templates/src/main/java/package/Application.java.ejs b/generators/server/templates/src/main/java/package/Application.java.ejs index 8c9d4314a30d..33cb3149a6c9 100644 --- a/generators/server/templates/src/main/java/package/Application.java.ejs +++ b/generators/server/templates/src/main/java/package/Application.java.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/server/templates/src/main/java/package/ApplicationWebXml.java.ejs b/generators/server/templates/src/main/java/package/ApplicationWebXml.java.ejs index df8531267bf9..fc79f7895940 100644 --- a/generators/server/templates/src/main/java/package/ApplicationWebXml.java.ejs +++ b/generators/server/templates/src/main/java/package/ApplicationWebXml.java.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/server/templates/src/main/java/package/GeneratedByJHipster.java.ejs b/generators/server/templates/src/main/java/package/GeneratedByJHipster.java.ejs index 20dfbe11e340..ad6c1246cf40 100644 --- a/generators/server/templates/src/main/java/package/GeneratedByJHipster.java.ejs +++ b/generators/server/templates/src/main/java/package/GeneratedByJHipster.java.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/server/templates/src/main/java/package/aop/logging/LoggingAspect.java.ejs b/generators/server/templates/src/main/java/package/aop/logging/LoggingAspect.java.ejs index d2be1a236613..606fb13cc309 100644 --- a/generators/server/templates/src/main/java/package/aop/logging/LoggingAspect.java.ejs +++ b/generators/server/templates/src/main/java/package/aop/logging/LoggingAspect.java.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/server/templates/src/main/java/package/client/AuthorizedFeignClient.java.ejs b/generators/server/templates/src/main/java/package/client/AuthorizedFeignClient.java.ejs index be3039ef6c81..d0cd60411952 100644 --- a/generators/server/templates/src/main/java/package/client/AuthorizedFeignClient.java.ejs +++ b/generators/server/templates/src/main/java/package/client/AuthorizedFeignClient.java.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/server/templates/src/main/java/package/client/AuthorizedUserFeignClient.java.ejs b/generators/server/templates/src/main/java/package/client/AuthorizedUserFeignClient.java.ejs index da3afa46acb9..ed1bb3903f53 100644 --- a/generators/server/templates/src/main/java/package/client/AuthorizedUserFeignClient.java.ejs +++ b/generators/server/templates/src/main/java/package/client/AuthorizedUserFeignClient.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/client/JWT_UserFeignClientInterceptor.java.ejs b/generators/server/templates/src/main/java/package/client/JWT_UserFeignClientInterceptor.java.ejs index a46f41f62216..0070a2189559 100644 --- a/generators/server/templates/src/main/java/package/client/JWT_UserFeignClientInterceptor.java.ejs +++ b/generators/server/templates/src/main/java/package/client/JWT_UserFeignClientInterceptor.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/client/OAuth2InterceptedFeignConfiguration.java.ejs b/generators/server/templates/src/main/java/package/client/OAuth2InterceptedFeignConfiguration.java.ejs index 4a2a1081b462..0a53e6ddd432 100644 --- a/generators/server/templates/src/main/java/package/client/OAuth2InterceptedFeignConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/client/OAuth2InterceptedFeignConfiguration.java.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/server/templates/src/main/java/package/client/OAuth2UserClientFeignConfiguration.java.ejs b/generators/server/templates/src/main/java/package/client/OAuth2UserClientFeignConfiguration.java.ejs index cb2c3c1d5486..496baf7b1c1a 100644 --- a/generators/server/templates/src/main/java/package/client/OAuth2UserClientFeignConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/client/OAuth2UserClientFeignConfiguration.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/client/OAuth2_UserFeignClientInterceptor.java.ejs b/generators/server/templates/src/main/java/package/client/OAuth2_UserFeignClientInterceptor.java.ejs index a411b0715b8f..2ba09f2f1aac 100644 --- a/generators/server/templates/src/main/java/package/client/OAuth2_UserFeignClientInterceptor.java.ejs +++ b/generators/server/templates/src/main/java/package/client/OAuth2_UserFeignClientInterceptor.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/client/TokenRelayRequestInterceptor.java.ejs b/generators/server/templates/src/main/java/package/client/TokenRelayRequestInterceptor.java.ejs index e6b81d2072d1..1dca6ba1babb 100644 --- a/generators/server/templates/src/main/java/package/client/TokenRelayRequestInterceptor.java.ejs +++ b/generators/server/templates/src/main/java/package/client/TokenRelayRequestInterceptor.java.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/server/templates/src/main/java/package/config/ApplicationProperties.java.ejs b/generators/server/templates/src/main/java/package/config/ApplicationProperties.java.ejs index 6a81cc4f83cb..41bcfec06f70 100644 --- a/generators/server/templates/src/main/java/package/config/ApplicationProperties.java.ejs +++ b/generators/server/templates/src/main/java/package/config/ApplicationProperties.java.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/server/templates/src/main/java/package/config/AsyncConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/AsyncConfiguration.java.ejs index 87e1ccf4508e..ebfb0941cab3 100644 --- a/generators/server/templates/src/main/java/package/config/AsyncConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/AsyncConfiguration.java.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/server/templates/src/main/java/package/config/CacheConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/CacheConfiguration.java.ejs index cd6bfa622096..8b7b7bdab433 100644 --- a/generators/server/templates/src/main/java/package/config/CacheConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/CacheConfiguration.java.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/server/templates/src/main/java/package/config/CacheFactoryConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/CacheFactoryConfiguration.java.ejs index 379b3a047cf7..44cbae0e41af 100644 --- a/generators/server/templates/src/main/java/package/config/CacheFactoryConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/CacheFactoryConfiguration.java.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/server/templates/src/main/java/package/config/CloudDatabaseConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/CloudDatabaseConfiguration.java.ejs index ffb8c24b6287..98583a81b20b 100644 --- a/generators/server/templates/src/main/java/package/config/CloudDatabaseConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/CloudDatabaseConfiguration.java.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/server/templates/src/main/java/package/config/Constants.java.ejs b/generators/server/templates/src/main/java/package/config/Constants.java.ejs index 776d3c38b68a..b9e3119f05dc 100644 --- a/generators/server/templates/src/main/java/package/config/Constants.java.ejs +++ b/generators/server/templates/src/main/java/package/config/Constants.java.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/server/templates/src/main/java/package/config/DatabaseConfiguration_cassandra.java.ejs b/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_cassandra.java.ejs index 9bb5026d1f38..fb774a716fb2 100644 --- a/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_cassandra.java.ejs +++ b/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_cassandra.java.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/server/templates/src/main/java/package/config/DatabaseConfiguration_couchbase.java.ejs b/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_couchbase.java.ejs index 93342f862e6d..cffa5c9f95be 100644 --- a/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_couchbase.java.ejs +++ b/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_couchbase.java.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/server/templates/src/main/java/package/config/DatabaseConfiguration_mongodb.java.ejs b/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_mongodb.java.ejs index 2d828608cfed..74a363097d37 100644 --- a/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_mongodb.java.ejs +++ b/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_mongodb.java.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/server/templates/src/main/java/package/config/DatabaseConfiguration_neo4j.java.ejs b/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_neo4j.java.ejs index 102efb4a1dc6..4d81b024def1 100644 --- a/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_neo4j.java.ejs +++ b/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_neo4j.java.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/server/templates/src/main/java/package/config/DatabaseConfiguration_sql.java.ejs b/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_sql.java.ejs index 1119715aa686..a7304fcfef31 100644 --- a/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_sql.java.ejs +++ b/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_sql.java.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/server/templates/src/main/java/package/config/DateTimeFormatConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/DateTimeFormatConfiguration.java.ejs index 041a23708664..3a46e30821cc 100644 --- a/generators/server/templates/src/main/java/package/config/DateTimeFormatConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/DateTimeFormatConfiguration.java.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/server/templates/src/main/java/package/config/ElasticsearchConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/ElasticsearchConfiguration.java.ejs index 2aeb89754dba..2dcccb8d7048 100644 --- a/generators/server/templates/src/main/java/package/config/ElasticsearchConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/ElasticsearchConfiguration.java.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/server/templates/src/main/java/package/config/FeignConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/FeignConfiguration.java.ejs index f7bd8e7befe0..f08e5c984bcb 100644 --- a/generators/server/templates/src/main/java/package/config/FeignConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/FeignConfiguration.java.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/server/templates/src/main/java/package/config/GatewayConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/GatewayConfiguration.java.ejs index da4750a90116..eace7ded5674 100644 --- a/generators/server/templates/src/main/java/package/config/GatewayConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/GatewayConfiguration.java.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/server/templates/src/main/java/package/config/JacksonConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/JacksonConfiguration.java.ejs index dbd7420edf1b..c4f508aabf88 100644 --- a/generators/server/templates/src/main/java/package/config/JacksonConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/JacksonConfiguration.java.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/server/templates/src/main/java/package/config/KafkaProperties.java.ejs b/generators/server/templates/src/main/java/package/config/KafkaProperties.java.ejs index 17c3c7dfa1a1..c5697654d385 100644 --- a/generators/server/templates/src/main/java/package/config/KafkaProperties.java.ejs +++ b/generators/server/templates/src/main/java/package/config/KafkaProperties.java.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/server/templates/src/main/java/package/config/LiquibaseConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/LiquibaseConfiguration.java.ejs index 8b3b24e68730..0dbb91a7faa6 100644 --- a/generators/server/templates/src/main/java/package/config/LiquibaseConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/LiquibaseConfiguration.java.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/server/templates/src/main/java/package/config/LocaleConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/LocaleConfiguration.java.ejs index 7ea527e37693..ecaa85b9f7a8 100644 --- a/generators/server/templates/src/main/java/package/config/LocaleConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/LocaleConfiguration.java.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/server/templates/src/main/java/package/config/LoggingAspectConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/LoggingAspectConfiguration.java.ejs index 77bc8af154e8..64f587e0e6e7 100644 --- a/generators/server/templates/src/main/java/package/config/LoggingAspectConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/LoggingAspectConfiguration.java.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/server/templates/src/main/java/package/config/LoggingConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/LoggingConfiguration.java.ejs index a84cdc235a2f..8eca3536cb02 100644 --- a/generators/server/templates/src/main/java/package/config/LoggingConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/LoggingConfiguration.java.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/server/templates/src/main/java/package/config/OAuth2SsoConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/OAuth2SsoConfiguration.java.ejs index 2daf2a872edd..30832ddd87c1 100644 --- a/generators/server/templates/src/main/java/package/config/OAuth2SsoConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/OAuth2SsoConfiguration.java.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/server/templates/src/main/java/package/config/OAuth2TokenServicesConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/OAuth2TokenServicesConfiguration.java.ejs index e2dc828a90d2..6f8ccd662006 100644 --- a/generators/server/templates/src/main/java/package/config/OAuth2TokenServicesConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/OAuth2TokenServicesConfiguration.java.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/server/templates/src/main/java/package/config/OpenApiConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/OpenApiConfiguration.java.ejs index 62a0054867fb..d8716d8c3db2 100644 --- a/generators/server/templates/src/main/java/package/config/OpenApiConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/OpenApiConfiguration.java.ejs @@ -1,20 +1,20 @@ <%# -Copyright 2013-2020 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. -This file is part of the JHipster project, see https://www.jhipster.tech/ -for more information. + 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"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + 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, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -%> package <%= packageName %>.config; diff --git a/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs index 234b4f4540cf..86d4c992960a 100644 --- a/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/SecurityConfiguration.java.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/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs b/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs index a44bd48f6334..ded6f1b1fd1c 100644 --- a/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs +++ b/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.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/server/templates/src/main/java/package/config/SecurityConfiguration_uaa.java.ejs b/generators/server/templates/src/main/java/package/config/SecurityConfiguration_uaa.java.ejs index f57f812d72fc..18bfa0250d2c 100644 --- a/generators/server/templates/src/main/java/package/config/SecurityConfiguration_uaa.java.ejs +++ b/generators/server/templates/src/main/java/package/config/SecurityConfiguration_uaa.java.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/server/templates/src/main/java/package/config/StaticResourcesWebConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/StaticResourcesWebConfiguration.java.ejs index 5583de2337dc..d9d8ff645644 100644 --- a/generators/server/templates/src/main/java/package/config/StaticResourcesWebConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/StaticResourcesWebConfiguration.java.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/server/templates/src/main/java/package/config/UaaConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/UaaConfiguration.java.ejs index df651ed7df84..75b7793627f0 100644 --- a/generators/server/templates/src/main/java/package/config/UaaConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/UaaConfiguration.java.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/server/templates/src/main/java/package/config/UaaProperties.java.ejs b/generators/server/templates/src/main/java/package/config/UaaProperties.java.ejs index 4d860d91c97a..ddbe0ee8889d 100644 --- a/generators/server/templates/src/main/java/package/config/UaaProperties.java.ejs +++ b/generators/server/templates/src/main/java/package/config/UaaProperties.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/config/UaaWebSecurityConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/UaaWebSecurityConfiguration.java.ejs index dead0db5f123..f538714e58cc 100644 --- a/generators/server/templates/src/main/java/package/config/UaaWebSecurityConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/UaaWebSecurityConfiguration.java.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/server/templates/src/main/java/package/config/WebConfigurer.java.ejs b/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs index a5ffc6bd0544..75c2b6060475 100644 --- a/generators/server/templates/src/main/java/package/config/WebConfigurer.java.ejs +++ b/generators/server/templates/src/main/java/package/config/WebConfigurer.java.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/server/templates/src/main/java/package/config/WebsocketConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/WebsocketConfiguration.java.ejs index 0e5212ba79ee..68f827b7a9f1 100644 --- a/generators/server/templates/src/main/java/package/config/WebsocketConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/WebsocketConfiguration.java.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/server/templates/src/main/java/package/config/WebsocketSecurityConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/WebsocketSecurityConfiguration.java.ejs index 9879e95c7c77..03e6b0356adc 100644 --- a/generators/server/templates/src/main/java/package/config/WebsocketSecurityConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/WebsocketSecurityConfiguration.java.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/server/templates/src/main/java/package/config/apidoc/GatewaySwaggerResourcesProvider.java.ejs b/generators/server/templates/src/main/java/package/config/apidoc/GatewaySwaggerResourcesProvider.java.ejs index bbbbb71417e4..03c1c0698a5c 100644 --- a/generators/server/templates/src/main/java/package/config/apidoc/GatewaySwaggerResourcesProvider.java.ejs +++ b/generators/server/templates/src/main/java/package/config/apidoc/GatewaySwaggerResourcesProvider.java.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/server/templates/src/main/java/package/config/dbmigrations/InitialSetupMigration.java.ejs b/generators/server/templates/src/main/java/package/config/dbmigrations/InitialSetupMigration.java.ejs index a640748bfbae..2b9717a70384 100644 --- a/generators/server/templates/src/main/java/package/config/dbmigrations/InitialSetupMigration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/dbmigrations/InitialSetupMigration.java.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/server/templates/src/main/java/package/config/dbmigrations/package-info.java.ejs b/generators/server/templates/src/main/java/package/config/dbmigrations/package-info.java.ejs index 54f63071d90e..ffbb18d01055 100644 --- a/generators/server/templates/src/main/java/package/config/dbmigrations/package-info.java.ejs +++ b/generators/server/templates/src/main/java/package/config/dbmigrations/package-info.java.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/server/templates/src/main/java/package/config/neo4j/Neo4jMigrations.java.ejs b/generators/server/templates/src/main/java/package/config/neo4j/Neo4jMigrations.java.ejs index 5586f3068b36..e6f69a686973 100644 --- a/generators/server/templates/src/main/java/package/config/neo4j/Neo4jMigrations.java.ejs +++ b/generators/server/templates/src/main/java/package/config/neo4j/Neo4jMigrations.java.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/server/templates/src/main/java/package/config/neo4j/package-info.java.ejs b/generators/server/templates/src/main/java/package/config/neo4j/package-info.java.ejs index fab4a342dfeb..4f3d55481691 100644 --- a/generators/server/templates/src/main/java/package/config/neo4j/package-info.java.ejs +++ b/generators/server/templates/src/main/java/package/config/neo4j/package-info.java.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/server/templates/src/main/java/package/config/oauth2/OAuth2AuthenticationConfiguration.java.ejs b/generators/server/templates/src/main/java/package/config/oauth2/OAuth2AuthenticationConfiguration.java.ejs index cbf88d063359..3e8e97ad0659 100644 --- a/generators/server/templates/src/main/java/package/config/oauth2/OAuth2AuthenticationConfiguration.java.ejs +++ b/generators/server/templates/src/main/java/package/config/oauth2/OAuth2AuthenticationConfiguration.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/config/oauth2/OAuth2JwtAccessTokenConverter.java.ejs b/generators/server/templates/src/main/java/package/config/oauth2/OAuth2JwtAccessTokenConverter.java.ejs index 402fe4ec97e6..9ea77201cb07 100644 --- a/generators/server/templates/src/main/java/package/config/oauth2/OAuth2JwtAccessTokenConverter.java.ejs +++ b/generators/server/templates/src/main/java/package/config/oauth2/OAuth2JwtAccessTokenConverter.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/config/oauth2/OAuth2Properties.java.ejs b/generators/server/templates/src/main/java/package/config/oauth2/OAuth2Properties.java.ejs index dfd78a91bab2..341d7920ec25 100644 --- a/generators/server/templates/src/main/java/package/config/oauth2/OAuth2Properties.java.ejs +++ b/generators/server/templates/src/main/java/package/config/oauth2/OAuth2Properties.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/config/package-info.java.ejs b/generators/server/templates/src/main/java/package/config/package-info.java.ejs index 11e0fe8b4a0d..7a06128f8e43 100644 --- a/generators/server/templates/src/main/java/package/config/package-info.java.ejs +++ b/generators/server/templates/src/main/java/package/config/package-info.java.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/server/templates/src/main/java/package/domain/AbstractAuditingEntity.java.ejs b/generators/server/templates/src/main/java/package/domain/AbstractAuditingEntity.java.ejs index a85fdac07799..a027e7d4ce5a 100644 --- a/generators/server/templates/src/main/java/package/domain/AbstractAuditingEntity.java.ejs +++ b/generators/server/templates/src/main/java/package/domain/AbstractAuditingEntity.java.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/server/templates/src/main/java/package/domain/Authority.java.ejs b/generators/server/templates/src/main/java/package/domain/Authority.java.ejs index ed81bb3c3c2a..f0fb714b77c4 100644 --- a/generators/server/templates/src/main/java/package/domain/Authority.java.ejs +++ b/generators/server/templates/src/main/java/package/domain/Authority.java.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/server/templates/src/main/java/package/domain/PersistentToken.java.ejs b/generators/server/templates/src/main/java/package/domain/PersistentToken.java.ejs index fc77ac4adcff..f12ed17a429f 100644 --- a/generators/server/templates/src/main/java/package/domain/PersistentToken.java.ejs +++ b/generators/server/templates/src/main/java/package/domain/PersistentToken.java.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/server/templates/src/main/java/package/domain/User.java.ejs b/generators/server/templates/src/main/java/package/domain/User.java.ejs index 28680f966c0e..f156e6c614c6 100644 --- a/generators/server/templates/src/main/java/package/domain/User.java.ejs +++ b/generators/server/templates/src/main/java/package/domain/User.java.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/server/templates/src/main/java/package/domain/package-info.java.ejs b/generators/server/templates/src/main/java/package/domain/package-info.java.ejs index 9ce28e03ec22..2d4d53b6f081 100644 --- a/generators/server/templates/src/main/java/package/domain/package-info.java.ejs +++ b/generators/server/templates/src/main/java/package/domain/package-info.java.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/server/templates/src/main/java/package/gateway/TokenRelayFilter.java.ejs b/generators/server/templates/src/main/java/package/gateway/TokenRelayFilter.java.ejs index f28d434e1f02..d8512456ab7e 100644 --- a/generators/server/templates/src/main/java/package/gateway/TokenRelayFilter.java.ejs +++ b/generators/server/templates/src/main/java/package/gateway/TokenRelayFilter.java.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/server/templates/src/main/java/package/gateway/accesscontrol/AccessControlFilter.java.ejs b/generators/server/templates/src/main/java/package/gateway/accesscontrol/AccessControlFilter.java.ejs index af48859a4339..9f7ba6951733 100644 --- a/generators/server/templates/src/main/java/package/gateway/accesscontrol/AccessControlFilter.java.ejs +++ b/generators/server/templates/src/main/java/package/gateway/accesscontrol/AccessControlFilter.java.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/server/templates/src/main/java/package/gateway/ratelimiting/RateLimitingFilter.java.ejs b/generators/server/templates/src/main/java/package/gateway/ratelimiting/RateLimitingFilter.java.ejs index 08114f96a401..e4f12f0d2cb9 100644 --- a/generators/server/templates/src/main/java/package/gateway/ratelimiting/RateLimitingFilter.java.ejs +++ b/generators/server/templates/src/main/java/package/gateway/ratelimiting/RateLimitingFilter.java.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/server/templates/src/main/java/package/gateway/responserewriting/SwaggerBasePathRewritingFilter.java.ejs b/generators/server/templates/src/main/java/package/gateway/responserewriting/SwaggerBasePathRewritingFilter.java.ejs index 85cbf17a3d24..30391bd02774 100644 --- a/generators/server/templates/src/main/java/package/gateway/responserewriting/SwaggerBasePathRewritingFilter.java.ejs +++ b/generators/server/templates/src/main/java/package/gateway/responserewriting/SwaggerBasePathRewritingFilter.java.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/server/templates/src/main/java/package/repository/AuthorityRepository.java.ejs b/generators/server/templates/src/main/java/package/repository/AuthorityRepository.java.ejs index ab29e23e80f0..72948c096ab2 100644 --- a/generators/server/templates/src/main/java/package/repository/AuthorityRepository.java.ejs +++ b/generators/server/templates/src/main/java/package/repository/AuthorityRepository.java.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/server/templates/src/main/java/package/repository/CustomN1qlCouchbaseRepository.java.ejs b/generators/server/templates/src/main/java/package/repository/CustomN1qlCouchbaseRepository.java.ejs index 077940a99f98..dfa2a7760a61 100644 --- a/generators/server/templates/src/main/java/package/repository/CustomN1qlCouchbaseRepository.java.ejs +++ b/generators/server/templates/src/main/java/package/repository/CustomN1qlCouchbaseRepository.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/repository/CustomReactiveN1qlCouchbaseRepository.java.ejs b/generators/server/templates/src/main/java/package/repository/CustomReactiveN1qlCouchbaseRepository.java.ejs index 548f4a132a67..863ce91c7ae7 100644 --- a/generators/server/templates/src/main/java/package/repository/CustomReactiveN1qlCouchbaseRepository.java.ejs +++ b/generators/server/templates/src/main/java/package/repository/CustomReactiveN1qlCouchbaseRepository.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/repository/N1qlCouchbaseRepository.java.ejs b/generators/server/templates/src/main/java/package/repository/N1qlCouchbaseRepository.java.ejs index 99a60a2d4917..d1bb07aeff4c 100644 --- a/generators/server/templates/src/main/java/package/repository/N1qlCouchbaseRepository.java.ejs +++ b/generators/server/templates/src/main/java/package/repository/N1qlCouchbaseRepository.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/repository/PersistentTokenRepository.java.ejs b/generators/server/templates/src/main/java/package/repository/PersistentTokenRepository.java.ejs index 65229abd3ea9..b2ef8d3e4d8b 100644 --- a/generators/server/templates/src/main/java/package/repository/PersistentTokenRepository.java.ejs +++ b/generators/server/templates/src/main/java/package/repository/PersistentTokenRepository.java.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/server/templates/src/main/java/package/repository/ReactiveN1qlCouchbaseRepository.java.ejs b/generators/server/templates/src/main/java/package/repository/ReactiveN1qlCouchbaseRepository.java.ejs index 7dfdb369ac5b..1548c4397092 100644 --- a/generators/server/templates/src/main/java/package/repository/ReactiveN1qlCouchbaseRepository.java.ejs +++ b/generators/server/templates/src/main/java/package/repository/ReactiveN1qlCouchbaseRepository.java.ejs @@ -1,14 +1,14 @@ <%# - Copyright 2013-2018 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/repository/UserRepository.java.ejs b/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs index c0d454489e5b..78106166b1ba 100644 --- a/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs +++ b/generators/server/templates/src/main/java/package/repository/UserRepository.java.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/server/templates/src/main/java/package/repository/package-info.java.ejs b/generators/server/templates/src/main/java/package/repository/package-info.java.ejs index ba160a93d683..91198aba9f11 100644 --- a/generators/server/templates/src/main/java/package/repository/package-info.java.ejs +++ b/generators/server/templates/src/main/java/package/repository/package-info.java.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/server/templates/src/main/java/package/repository/rowmapper/UserRowMapper.java.ejs b/generators/server/templates/src/main/java/package/repository/rowmapper/UserRowMapper.java.ejs index 45643a0455d7..00b6e2e69803 100644 --- a/generators/server/templates/src/main/java/package/repository/rowmapper/UserRowMapper.java.ejs +++ b/generators/server/templates/src/main/java/package/repository/rowmapper/UserRowMapper.java.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/server/templates/src/main/java/package/repository/search/SearchCouchbaseRepository.java.ejs b/generators/server/templates/src/main/java/package/repository/search/SearchCouchbaseRepository.java.ejs index a1b96ff12100..e9eddfe39e7a 100644 --- a/generators/server/templates/src/main/java/package/repository/search/SearchCouchbaseRepository.java.ejs +++ b/generators/server/templates/src/main/java/package/repository/search/SearchCouchbaseRepository.java.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/server/templates/src/main/java/package/repository/search/UserSearchRepository.java.ejs b/generators/server/templates/src/main/java/package/repository/search/UserSearchRepository.java.ejs index 2a5b81df78fb..af5ec89b572b 100644 --- a/generators/server/templates/src/main/java/package/repository/search/UserSearchRepository.java.ejs +++ b/generators/server/templates/src/main/java/package/repository/search/UserSearchRepository.java.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/server/templates/src/main/java/package/repository/search/package-info.java.ejs b/generators/server/templates/src/main/java/package/repository/search/package-info.java.ejs index 379a906ed807..c8b14a1b02a9 100644 --- a/generators/server/templates/src/main/java/package/repository/search/package-info.java.ejs +++ b/generators/server/templates/src/main/java/package/repository/search/package-info.java.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/server/templates/src/main/java/package/security/AuthoritiesConstants.java.ejs b/generators/server/templates/src/main/java/package/security/AuthoritiesConstants.java.ejs index b74f588c6dbe..39aa38f7bb7d 100644 --- a/generators/server/templates/src/main/java/package/security/AuthoritiesConstants.java.ejs +++ b/generators/server/templates/src/main/java/package/security/AuthoritiesConstants.java.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/server/templates/src/main/java/package/security/DomainUserDetailsService.java.ejs b/generators/server/templates/src/main/java/package/security/DomainUserDetailsService.java.ejs index f4c052120ff8..bf222978f40d 100644 --- a/generators/server/templates/src/main/java/package/security/DomainUserDetailsService.java.ejs +++ b/generators/server/templates/src/main/java/package/security/DomainUserDetailsService.java.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/server/templates/src/main/java/package/security/IatTokenEnhancer.java.ejs b/generators/server/templates/src/main/java/package/security/IatTokenEnhancer.java.ejs index 706da02d6f55..fe21c30059da 100644 --- a/generators/server/templates/src/main/java/package/security/IatTokenEnhancer.java.ejs +++ b/generators/server/templates/src/main/java/package/security/IatTokenEnhancer.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/security/PersistentTokenRememberMeServices.java.ejs b/generators/server/templates/src/main/java/package/security/PersistentTokenRememberMeServices.java.ejs index f3fe5c60e48e..45d58d4ee863 100644 --- a/generators/server/templates/src/main/java/package/security/PersistentTokenRememberMeServices.java.ejs +++ b/generators/server/templates/src/main/java/package/security/PersistentTokenRememberMeServices.java.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/server/templates/src/main/java/package/security/SecurityUtils.java.ejs b/generators/server/templates/src/main/java/package/security/SecurityUtils.java.ejs index 8b853185a6ac..4bdb38326337 100644 --- a/generators/server/templates/src/main/java/package/security/SecurityUtils.java.ejs +++ b/generators/server/templates/src/main/java/package/security/SecurityUtils.java.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/server/templates/src/main/java/package/security/SpringSecurityAuditorAware.java.ejs b/generators/server/templates/src/main/java/package/security/SpringSecurityAuditorAware.java.ejs index ee51a34a64a8..674d709f079e 100644 --- a/generators/server/templates/src/main/java/package/security/SpringSecurityAuditorAware.java.ejs +++ b/generators/server/templates/src/main/java/package/security/SpringSecurityAuditorAware.java.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/server/templates/src/main/java/package/security/UserNotActivatedException.java.ejs b/generators/server/templates/src/main/java/package/security/UserNotActivatedException.java.ejs index b85cb0fe4a02..b2f3467482c3 100644 --- a/generators/server/templates/src/main/java/package/security/UserNotActivatedException.java.ejs +++ b/generators/server/templates/src/main/java/package/security/UserNotActivatedException.java.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/server/templates/src/main/java/package/security/jwt/JWTConfigurer.java.ejs b/generators/server/templates/src/main/java/package/security/jwt/JWTConfigurer.java.ejs index 6cc778729ac4..1a39143189e9 100644 --- a/generators/server/templates/src/main/java/package/security/jwt/JWTConfigurer.java.ejs +++ b/generators/server/templates/src/main/java/package/security/jwt/JWTConfigurer.java.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/server/templates/src/main/java/package/security/jwt/JWTFilter.java.ejs b/generators/server/templates/src/main/java/package/security/jwt/JWTFilter.java.ejs index defa025b14fa..0d6c8fa539d1 100644 --- a/generators/server/templates/src/main/java/package/security/jwt/JWTFilter.java.ejs +++ b/generators/server/templates/src/main/java/package/security/jwt/JWTFilter.java.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/server/templates/src/main/java/package/security/jwt/JWTRelayGatewayFilterFactory.java.ejs b/generators/server/templates/src/main/java/package/security/jwt/JWTRelayGatewayFilterFactory.java.ejs index 52c1f0c6639e..3d2396df648d 100644 --- a/generators/server/templates/src/main/java/package/security/jwt/JWTRelayGatewayFilterFactory.java.ejs +++ b/generators/server/templates/src/main/java/package/security/jwt/JWTRelayGatewayFilterFactory.java.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/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs b/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs index 1c71a2c4adf9..6280c89a576e 100644 --- a/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.ejs +++ b/generators/server/templates/src/main/java/package/security/jwt/TokenProvider.java.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/server/templates/src/main/java/package/security/oauth2/AudienceValidator.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/AudienceValidator.java.ejs index 99f514cb6e4a..dfdf5aedf200 100644 --- a/generators/server/templates/src/main/java/package/security/oauth2/AudienceValidator.java.ejs +++ b/generators/server/templates/src/main/java/package/security/oauth2/AudienceValidator.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/security/oauth2/AuthorizationHeaderFilter.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/AuthorizationHeaderFilter.java.ejs index a621efd10c78..88834306ffe8 100644 --- a/generators/server/templates/src/main/java/package/security/oauth2/AuthorizationHeaderFilter.java.ejs +++ b/generators/server/templates/src/main/java/package/security/oauth2/AuthorizationHeaderFilter.java.ejs @@ -1,20 +1,20 @@ <%# -Copyright 2013-2020 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. -This file is part of the JHipster project, see https://jhipster.github.io/ -for more information. + 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"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + 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, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -%> package <%= packageName %>.security.oauth2; diff --git a/generators/server/templates/src/main/java/package/security/oauth2/AuthorizationHeaderUtil.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/AuthorizationHeaderUtil.java.ejs index d3f2b8f29d2a..30fe567d266f 100644 --- a/generators/server/templates/src/main/java/package/security/oauth2/AuthorizationHeaderUtil.java.ejs +++ b/generators/server/templates/src/main/java/package/security/oauth2/AuthorizationHeaderUtil.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/security/oauth2/CachedUserInfoTokenServices.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/CachedUserInfoTokenServices.java.ejs index d8c2ec657047..1eb7a72528a2 100644 --- a/generators/server/templates/src/main/java/package/security/oauth2/CachedUserInfoTokenServices.java.ejs +++ b/generators/server/templates/src/main/java/package/security/oauth2/CachedUserInfoTokenServices.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/security/oauth2/CookieCollection.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/CookieCollection.java.ejs index 9a72219cca56..1d4b14fdafe0 100644 --- a/generators/server/templates/src/main/java/package/security/oauth2/CookieCollection.java.ejs +++ b/generators/server/templates/src/main/java/package/security/oauth2/CookieCollection.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/security/oauth2/CookieTokenExtractor.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/CookieTokenExtractor.java.ejs index 197671e51080..defbf6c97e0d 100644 --- a/generators/server/templates/src/main/java/package/security/oauth2/CookieTokenExtractor.java.ejs +++ b/generators/server/templates/src/main/java/package/security/oauth2/CookieTokenExtractor.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/security/oauth2/CookiesHttpServletRequestWrapper.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/CookiesHttpServletRequestWrapper.java.ejs index a62d99412cad..ff3719bd38d4 100644 --- a/generators/server/templates/src/main/java/package/security/oauth2/CookiesHttpServletRequestWrapper.java.ejs +++ b/generators/server/templates/src/main/java/package/security/oauth2/CookiesHttpServletRequestWrapper.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/security/oauth2/JwtGrantedAuthorityConverter.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/JwtGrantedAuthorityConverter.java.ejs index 3af7c799be53..52c3de681b02 100644 --- a/generators/server/templates/src/main/java/package/security/oauth2/JwtGrantedAuthorityConverter.java.ejs +++ b/generators/server/templates/src/main/java/package/security/oauth2/JwtGrantedAuthorityConverter.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/security/oauth2/OAuth2AuthenticationService.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/OAuth2AuthenticationService.java.ejs index a80e4c923f3e..a349c2a7a64e 100644 --- a/generators/server/templates/src/main/java/package/security/oauth2/OAuth2AuthenticationService.java.ejs +++ b/generators/server/templates/src/main/java/package/security/oauth2/OAuth2AuthenticationService.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/security/oauth2/OAuth2CookieHelper.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/OAuth2CookieHelper.java.ejs index 52fc798808bb..dcbeacc597ea 100644 --- a/generators/server/templates/src/main/java/package/security/oauth2/OAuth2CookieHelper.java.ejs +++ b/generators/server/templates/src/main/java/package/security/oauth2/OAuth2CookieHelper.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/security/oauth2/OAuth2Cookies.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/OAuth2Cookies.java.ejs index 9963495fe494..67bcd30157f5 100644 --- a/generators/server/templates/src/main/java/package/security/oauth2/OAuth2Cookies.java.ejs +++ b/generators/server/templates/src/main/java/package/security/oauth2/OAuth2Cookies.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/security/oauth2/OAuth2SignatureVerifierClient.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/OAuth2SignatureVerifierClient.java.ejs index fe4bc860c7fd..b3009f88410a 100644 --- a/generators/server/templates/src/main/java/package/security/oauth2/OAuth2SignatureVerifierClient.java.ejs +++ b/generators/server/templates/src/main/java/package/security/oauth2/OAuth2SignatureVerifierClient.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/security/oauth2/OAuth2TokenEndpointClient.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/OAuth2TokenEndpointClient.java.ejs index d3655fd2a0b3..f4125be4adc5 100644 --- a/generators/server/templates/src/main/java/package/security/oauth2/OAuth2TokenEndpointClient.java.ejs +++ b/generators/server/templates/src/main/java/package/security/oauth2/OAuth2TokenEndpointClient.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/security/oauth2/OAuth2TokenEndpointClientAdapter.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/OAuth2TokenEndpointClientAdapter.java.ejs index 7a2479b0f603..de5e93ac27d0 100644 --- a/generators/server/templates/src/main/java/package/security/oauth2/OAuth2TokenEndpointClientAdapter.java.ejs +++ b/generators/server/templates/src/main/java/package/security/oauth2/OAuth2TokenEndpointClientAdapter.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/security/oauth2/OAuthIdpTokenResponseDTO.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/OAuthIdpTokenResponseDTO.java.ejs index d0669efc71c1..e0116df7094d 100644 --- a/generators/server/templates/src/main/java/package/security/oauth2/OAuthIdpTokenResponseDTO.java.ejs +++ b/generators/server/templates/src/main/java/package/security/oauth2/OAuthIdpTokenResponseDTO.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/security/oauth2/SimpleAuthoritiesExtractor.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/SimpleAuthoritiesExtractor.java.ejs index 0a7a66db595d..f4b6a1cee9c7 100644 --- a/generators/server/templates/src/main/java/package/security/oauth2/SimpleAuthoritiesExtractor.java.ejs +++ b/generators/server/templates/src/main/java/package/security/oauth2/SimpleAuthoritiesExtractor.java.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/server/templates/src/main/java/package/security/oauth2/SimplePrincipalExtractor.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/SimplePrincipalExtractor.java.ejs index 6d0ddb051889..9852144a2e8e 100644 --- a/generators/server/templates/src/main/java/package/security/oauth2/SimplePrincipalExtractor.java.ejs +++ b/generators/server/templates/src/main/java/package/security/oauth2/SimplePrincipalExtractor.java.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/server/templates/src/main/java/package/security/oauth2/UaaSignatureVerifierClient.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/UaaSignatureVerifierClient.java.ejs index 546dc3fe950e..d51b04f8f486 100644 --- a/generators/server/templates/src/main/java/package/security/oauth2/UaaSignatureVerifierClient.java.ejs +++ b/generators/server/templates/src/main/java/package/security/oauth2/UaaSignatureVerifierClient.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/security/oauth2/UaaTokenEndpointClient.java.ejs b/generators/server/templates/src/main/java/package/security/oauth2/UaaTokenEndpointClient.java.ejs index 0b7b9f9e5623..b833657b9e40 100644 --- a/generators/server/templates/src/main/java/package/security/oauth2/UaaTokenEndpointClient.java.ejs +++ b/generators/server/templates/src/main/java/package/security/oauth2/UaaTokenEndpointClient.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/security/package-info.java.ejs b/generators/server/templates/src/main/java/package/security/package-info.java.ejs index 080862cd412c..187e2775f315 100644 --- a/generators/server/templates/src/main/java/package/security/package-info.java.ejs +++ b/generators/server/templates/src/main/java/package/security/package-info.java.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/server/templates/src/main/java/package/service/ColumnConverter.java.ejs b/generators/server/templates/src/main/java/package/service/ColumnConverter.java.ejs index 862a5f7c1272..3f004fc5e17b 100644 --- a/generators/server/templates/src/main/java/package/service/ColumnConverter.java.ejs +++ b/generators/server/templates/src/main/java/package/service/ColumnConverter.java.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/server/templates/src/main/java/package/service/EmailAlreadyUsedException.java.ejs b/generators/server/templates/src/main/java/package/service/EmailAlreadyUsedException.java.ejs index 91fdc7c9db5a..1610c5f41752 100644 --- a/generators/server/templates/src/main/java/package/service/EmailAlreadyUsedException.java.ejs +++ b/generators/server/templates/src/main/java/package/service/EmailAlreadyUsedException.java.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/server/templates/src/main/java/package/service/EntityManager.java.ejs b/generators/server/templates/src/main/java/package/service/EntityManager.java.ejs index 9ed66799e5ec..aef1db9963ee 100644 --- a/generators/server/templates/src/main/java/package/service/EntityManager.java.ejs +++ b/generators/server/templates/src/main/java/package/service/EntityManager.java.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/server/templates/src/main/java/package/service/InvalidPasswordException.java.ejs b/generators/server/templates/src/main/java/package/service/InvalidPasswordException.java.ejs index efa829a6b885..7f0081becf98 100644 --- a/generators/server/templates/src/main/java/package/service/InvalidPasswordException.java.ejs +++ b/generators/server/templates/src/main/java/package/service/InvalidPasswordException.java.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/server/templates/src/main/java/package/service/MailService.java.ejs b/generators/server/templates/src/main/java/package/service/MailService.java.ejs index 5b9cd00980c8..7b98542bb120 100644 --- a/generators/server/templates/src/main/java/package/service/MailService.java.ejs +++ b/generators/server/templates/src/main/java/package/service/MailService.java.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/server/templates/src/main/java/package/service/UserService.java.ejs b/generators/server/templates/src/main/java/package/service/UserService.java.ejs index e3e2a4e64771..24fe1b979370 100644 --- a/generators/server/templates/src/main/java/package/service/UserService.java.ejs +++ b/generators/server/templates/src/main/java/package/service/UserService.java.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/server/templates/src/main/java/package/service/UsernameAlreadyUsedException.java.ejs b/generators/server/templates/src/main/java/package/service/UsernameAlreadyUsedException.java.ejs index 98bf1f4d0c43..36895d2ad224 100644 --- a/generators/server/templates/src/main/java/package/service/UsernameAlreadyUsedException.java.ejs +++ b/generators/server/templates/src/main/java/package/service/UsernameAlreadyUsedException.java.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/server/templates/src/main/java/package/service/dto/PasswordChangeDTO.java.ejs b/generators/server/templates/src/main/java/package/service/dto/PasswordChangeDTO.java.ejs index 5560005e0452..0ce5da2f6d69 100644 --- a/generators/server/templates/src/main/java/package/service/dto/PasswordChangeDTO.java.ejs +++ b/generators/server/templates/src/main/java/package/service/dto/PasswordChangeDTO.java.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/server/templates/src/main/java/package/service/dto/UserDTO.java.ejs b/generators/server/templates/src/main/java/package/service/dto/UserDTO.java.ejs index b96ce595ff49..3ed28084893a 100644 --- a/generators/server/templates/src/main/java/package/service/dto/UserDTO.java.ejs +++ b/generators/server/templates/src/main/java/package/service/dto/UserDTO.java.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/server/templates/src/main/java/package/service/dto/package-info.java.ejs b/generators/server/templates/src/main/java/package/service/dto/package-info.java.ejs index 56c3d119ad06..b4227618e95e 100644 --- a/generators/server/templates/src/main/java/package/service/dto/package-info.java.ejs +++ b/generators/server/templates/src/main/java/package/service/dto/package-info.java.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/server/templates/src/main/java/package/service/mapper/UserMapper.java.ejs b/generators/server/templates/src/main/java/package/service/mapper/UserMapper.java.ejs index bc69f9d962f6..12af4c668362 100644 --- a/generators/server/templates/src/main/java/package/service/mapper/UserMapper.java.ejs +++ b/generators/server/templates/src/main/java/package/service/mapper/UserMapper.java.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/server/templates/src/main/java/package/service/mapper/package-info.java.ejs b/generators/server/templates/src/main/java/package/service/mapper/package-info.java.ejs index cc28f55ed64c..d876be60412b 100644 --- a/generators/server/templates/src/main/java/package/service/mapper/package-info.java.ejs +++ b/generators/server/templates/src/main/java/package/service/mapper/package-info.java.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/server/templates/src/main/java/package/service/package-info.java.ejs b/generators/server/templates/src/main/java/package/service/package-info.java.ejs index f51b29b60bfd..4cbc7b9d2ace 100644 --- a/generators/server/templates/src/main/java/package/service/package-info.java.ejs +++ b/generators/server/templates/src/main/java/package/service/package-info.java.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/server/templates/src/main/java/package/web/filter/RefreshTokenFilter.java.ejs b/generators/server/templates/src/main/java/package/web/filter/RefreshTokenFilter.java.ejs index 56d35877ffa4..a043529b59c3 100755 --- a/generators/server/templates/src/main/java/package/web/filter/RefreshTokenFilter.java.ejs +++ b/generators/server/templates/src/main/java/package/web/filter/RefreshTokenFilter.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/web/filter/RefreshTokenFilterConfigurer.java.ejs b/generators/server/templates/src/main/java/package/web/filter/RefreshTokenFilterConfigurer.java.ejs index 9509894e7c54..075c169f45cb 100755 --- a/generators/server/templates/src/main/java/package/web/filter/RefreshTokenFilterConfigurer.java.ejs +++ b/generators/server/templates/src/main/java/package/web/filter/RefreshTokenFilterConfigurer.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/web/filter/RouteDetectorFilter.java.ejs b/generators/server/templates/src/main/java/package/web/filter/RouteDetectorFilter.java.ejs index e8ce0a467aab..9255648a9a4c 100644 --- a/generators/server/templates/src/main/java/package/web/filter/RouteDetectorFilter.java.ejs +++ b/generators/server/templates/src/main/java/package/web/filter/RouteDetectorFilter.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/web/filter/SpaWebFilter.java.ejs b/generators/server/templates/src/main/java/package/web/filter/SpaWebFilter.java.ejs index 8ec06adf9883..faa6d750b351 100644 --- a/generators/server/templates/src/main/java/package/web/filter/SpaWebFilter.java.ejs +++ b/generators/server/templates/src/main/java/package/web/filter/SpaWebFilter.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/web/rest/AccountResource.java.ejs b/generators/server/templates/src/main/java/package/web/rest/AccountResource.java.ejs index 956c7cea2fca..d5a39a23d323 100644 --- a/generators/server/templates/src/main/java/package/web/rest/AccountResource.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/AccountResource.java.ejs @@ -1,20 +1,20 @@ <%# -Copyright 2013-2020 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. -This file is part of the JHipster project, see https://www.jhipster.tech/ -for more information. + 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"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + 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, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -%> package <%= packageName %>.web.rest; diff --git a/generators/server/templates/src/main/java/package/web/rest/AuthInfoResource.java.ejs b/generators/server/templates/src/main/java/package/web/rest/AuthInfoResource.java.ejs index c9f78195bea4..a2688fc0b1c5 100644 --- a/generators/server/templates/src/main/java/package/web/rest/AuthInfoResource.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/AuthInfoResource.java.ejs @@ -1,20 +1,20 @@ <%# - Copyright 2013-2020 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see http://www.jhipster.tech/ - for more information. + 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"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at + 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, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -%> package <%= packageName %>.web.rest; diff --git a/generators/server/templates/src/main/java/package/web/rest/AuthResource.java.ejs b/generators/server/templates/src/main/java/package/web/rest/AuthResource.java.ejs index 6d771da2ba14..91d6fbd1416d 100755 --- a/generators/server/templates/src/main/java/package/web/rest/AuthResource.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/AuthResource.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/main/java/package/web/rest/ClientForwardController.java.ejs b/generators/server/templates/src/main/java/package/web/rest/ClientForwardController.java.ejs index 695b2f537c6b..457b036a65af 100644 --- a/generators/server/templates/src/main/java/package/web/rest/ClientForwardController.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/ClientForwardController.java.ejs @@ -1,20 +1,20 @@ <%# -Copyright 2013-2020 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. -This file is part of the JHipster project, see https://www.jhipster.tech/ -for more information. + 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"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + 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, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -%> package <%= packageName %>.web.rest; diff --git a/generators/server/templates/src/main/java/package/web/rest/GatewayResource.java.ejs b/generators/server/templates/src/main/java/package/web/rest/GatewayResource.java.ejs index 8997c8519632..f894d3a2e863 100644 --- a/generators/server/templates/src/main/java/package/web/rest/GatewayResource.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/GatewayResource.java.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/server/templates/src/main/java/package/web/rest/KafkaResource.java.ejs b/generators/server/templates/src/main/java/package/web/rest/KafkaResource.java.ejs index deab0299fec5..c293a107506d 100644 --- a/generators/server/templates/src/main/java/package/web/rest/KafkaResource.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/KafkaResource.java.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/server/templates/src/main/java/package/web/rest/LogoutResource.java.ejs b/generators/server/templates/src/main/java/package/web/rest/LogoutResource.java.ejs index af368369a159..a82447c23d7a 100644 --- a/generators/server/templates/src/main/java/package/web/rest/LogoutResource.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/LogoutResource.java.ejs @@ -1,5 +1,5 @@ <%# - Copyright 2013-2018 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. @@ -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/server/templates/src/main/java/package/web/rest/UserJWTController.java.ejs b/generators/server/templates/src/main/java/package/web/rest/UserJWTController.java.ejs index 11bf71fa1123..64eb9afda00b 100644 --- a/generators/server/templates/src/main/java/package/web/rest/UserJWTController.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/UserJWTController.java.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/server/templates/src/main/java/package/web/rest/UserResource.java.ejs b/generators/server/templates/src/main/java/package/web/rest/UserResource.java.ejs index 0348fb99b3ee..8ec784c29d98 100644 --- a/generators/server/templates/src/main/java/package/web/rest/UserResource.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/UserResource.java.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/server/templates/src/main/java/package/web/rest/errors/BadRequestAlertException.java.ejs b/generators/server/templates/src/main/java/package/web/rest/errors/BadRequestAlertException.java.ejs index 6119831ab804..aef646eee760 100644 --- a/generators/server/templates/src/main/java/package/web/rest/errors/BadRequestAlertException.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/errors/BadRequestAlertException.java.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/server/templates/src/main/java/package/web/rest/errors/EmailAlreadyUsedException.java.ejs b/generators/server/templates/src/main/java/package/web/rest/errors/EmailAlreadyUsedException.java.ejs index e4fe57ab53a9..2d539cf7cad7 100644 --- a/generators/server/templates/src/main/java/package/web/rest/errors/EmailAlreadyUsedException.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/errors/EmailAlreadyUsedException.java.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/server/templates/src/main/java/package/web/rest/errors/ErrorConstants.java.ejs b/generators/server/templates/src/main/java/package/web/rest/errors/ErrorConstants.java.ejs index 2ee823337a23..5ebe2e58cd0e 100644 --- a/generators/server/templates/src/main/java/package/web/rest/errors/ErrorConstants.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/errors/ErrorConstants.java.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/server/templates/src/main/java/package/web/rest/errors/ExceptionTranslator.java.ejs b/generators/server/templates/src/main/java/package/web/rest/errors/ExceptionTranslator.java.ejs index 868b7c37798c..9a8eaf58126d 100644 --- a/generators/server/templates/src/main/java/package/web/rest/errors/ExceptionTranslator.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/errors/ExceptionTranslator.java.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/server/templates/src/main/java/package/web/rest/errors/FieldErrorVM.java.ejs b/generators/server/templates/src/main/java/package/web/rest/errors/FieldErrorVM.java.ejs index e71d124c2f84..75f23ef91867 100644 --- a/generators/server/templates/src/main/java/package/web/rest/errors/FieldErrorVM.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/errors/FieldErrorVM.java.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/server/templates/src/main/java/package/web/rest/errors/InvalidPasswordException.java.ejs b/generators/server/templates/src/main/java/package/web/rest/errors/InvalidPasswordException.java.ejs index 08b67d6ce0e1..a00082f89b1b 100644 --- a/generators/server/templates/src/main/java/package/web/rest/errors/InvalidPasswordException.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/errors/InvalidPasswordException.java.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/server/templates/src/main/java/package/web/rest/errors/LoginAlreadyUsedException.java.ejs b/generators/server/templates/src/main/java/package/web/rest/errors/LoginAlreadyUsedException.java.ejs index 2b667b2fb68f..ebcb326b4f5f 100644 --- a/generators/server/templates/src/main/java/package/web/rest/errors/LoginAlreadyUsedException.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/errors/LoginAlreadyUsedException.java.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/server/templates/src/main/java/package/web/rest/errors/package-info.java.ejs b/generators/server/templates/src/main/java/package/web/rest/errors/package-info.java.ejs index e0a251389c2f..51977793631c 100644 --- a/generators/server/templates/src/main/java/package/web/rest/errors/package-info.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/errors/package-info.java.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/server/templates/src/main/java/package/web/rest/package-info.java.ejs b/generators/server/templates/src/main/java/package/web/rest/package-info.java.ejs index 39a18e28560c..43ec0c744e39 100644 --- a/generators/server/templates/src/main/java/package/web/rest/package-info.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/package-info.java.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/server/templates/src/main/java/package/web/rest/vm/KeyAndPasswordVM.java.ejs b/generators/server/templates/src/main/java/package/web/rest/vm/KeyAndPasswordVM.java.ejs index 162bd48abe56..5f8b8336a90f 100644 --- a/generators/server/templates/src/main/java/package/web/rest/vm/KeyAndPasswordVM.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/vm/KeyAndPasswordVM.java.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/server/templates/src/main/java/package/web/rest/vm/LoginVM.java.ejs b/generators/server/templates/src/main/java/package/web/rest/vm/LoginVM.java.ejs index 2dfecc8ca436..8a01ee8ba5fc 100644 --- a/generators/server/templates/src/main/java/package/web/rest/vm/LoginVM.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/vm/LoginVM.java.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/server/templates/src/main/java/package/web/rest/vm/ManagedUserVM.java.ejs b/generators/server/templates/src/main/java/package/web/rest/vm/ManagedUserVM.java.ejs index dd86a5275a65..8b2c39eccc5a 100644 --- a/generators/server/templates/src/main/java/package/web/rest/vm/ManagedUserVM.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/vm/ManagedUserVM.java.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/server/templates/src/main/java/package/web/rest/vm/RouteVM.java.ejs b/generators/server/templates/src/main/java/package/web/rest/vm/RouteVM.java.ejs index 19cefd9bb575..f55a24fb5a68 100644 --- a/generators/server/templates/src/main/java/package/web/rest/vm/RouteVM.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/vm/RouteVM.java.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/server/templates/src/main/java/package/web/rest/vm/package-info.java.ejs b/generators/server/templates/src/main/java/package/web/rest/vm/package-info.java.ejs index 7773d02ea3c2..cf923e54f034 100644 --- a/generators/server/templates/src/main/java/package/web/rest/vm/package-info.java.ejs +++ b/generators/server/templates/src/main/java/package/web/rest/vm/package-info.java.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/server/templates/src/main/java/package/web/websocket/ActivityService.java.ejs b/generators/server/templates/src/main/java/package/web/websocket/ActivityService.java.ejs index 4748ecd42dbf..acda1fc63492 100644 --- a/generators/server/templates/src/main/java/package/web/websocket/ActivityService.java.ejs +++ b/generators/server/templates/src/main/java/package/web/websocket/ActivityService.java.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/server/templates/src/main/java/package/web/websocket/dto/ActivityDTO.java.ejs b/generators/server/templates/src/main/java/package/web/websocket/dto/ActivityDTO.java.ejs index 047f73655307..1c856edf4ae6 100644 --- a/generators/server/templates/src/main/java/package/web/websocket/dto/ActivityDTO.java.ejs +++ b/generators/server/templates/src/main/java/package/web/websocket/dto/ActivityDTO.java.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/server/templates/src/main/java/package/web/websocket/dto/package-info.java.ejs b/generators/server/templates/src/main/java/package/web/websocket/dto/package-info.java.ejs index 416ad703a54d..c47274f89eb3 100644 --- a/generators/server/templates/src/main/java/package/web/websocket/dto/package-info.java.ejs +++ b/generators/server/templates/src/main/java/package/web/websocket/dto/package-info.java.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/server/templates/src/main/java/package/web/websocket/package-info.java.ejs b/generators/server/templates/src/main/java/package/web/websocket/package-info.java.ejs index 00b4cb359f99..b2e3c2dc0ec9 100644 --- a/generators/server/templates/src/main/java/package/web/websocket/package-info.java.ejs +++ b/generators/server/templates/src/main/java/package/web/websocket/package-info.java.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/server/templates/src/main/resources/config/application-dev.yml.ejs b/generators/server/templates/src/main/resources/config/application-dev.yml.ejs index 431e9b20db1e..d609091bded7 100644 --- a/generators/server/templates/src/main/resources/config/application-dev.yml.ejs +++ b/generators/server/templates/src/main/resources/config/application-dev.yml.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/server/templates/src/main/resources/config/application-prod.yml.ejs b/generators/server/templates/src/main/resources/config/application-prod.yml.ejs index f1a0bb34bbaa..f216da21786e 100644 --- a/generators/server/templates/src/main/resources/config/application-prod.yml.ejs +++ b/generators/server/templates/src/main/resources/config/application-prod.yml.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/server/templates/src/main/resources/config/application.yml.ejs b/generators/server/templates/src/main/resources/config/application.yml.ejs index 7bad71dabc31..84ee32455921 100644 --- a/generators/server/templates/src/main/resources/config/application.yml.ejs +++ b/generators/server/templates/src/main/resources/config/application.yml.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/server/templates/src/main/resources/config/bootstrap-prod.yml.ejs b/generators/server/templates/src/main/resources/config/bootstrap-prod.yml.ejs index 489098f41db2..3937adf5cd67 100644 --- a/generators/server/templates/src/main/resources/config/bootstrap-prod.yml.ejs +++ b/generators/server/templates/src/main/resources/config/bootstrap-prod.yml.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/server/templates/src/main/resources/config/bootstrap.yml.ejs b/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs index b9d73073d573..0c2a199ec9ad 100644 --- a/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs +++ b/generators/server/templates/src/main/resources/config/bootstrap.yml.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/server/templates/src/main/resources/config/cql/changelog/create-tables.cql.ejs b/generators/server/templates/src/main/resources/config/cql/changelog/create-tables.cql.ejs index bd3126d25bc7..11d2c9af6cc9 100644 --- a/generators/server/templates/src/main/resources/config/cql/changelog/create-tables.cql.ejs +++ b/generators/server/templates/src/main/resources/config/cql/changelog/create-tables.cql.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/server/templates/src/main/resources/config/cql/changelog/insert_default_users.cql.ejs b/generators/server/templates/src/main/resources/config/cql/changelog/insert_default_users.cql.ejs index 2eb71352c56c..44a77899f5f3 100644 --- a/generators/server/templates/src/main/resources/config/cql/changelog/insert_default_users.cql.ejs +++ b/generators/server/templates/src/main/resources/config/cql/changelog/insert_default_users.cql.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/server/templates/src/main/resources/config/cql/create-keyspace-prod.cql.ejs b/generators/server/templates/src/main/resources/config/cql/create-keyspace-prod.cql.ejs index 80285110292c..52da530340d9 100644 --- a/generators/server/templates/src/main/resources/config/cql/create-keyspace-prod.cql.ejs +++ b/generators/server/templates/src/main/resources/config/cql/create-keyspace-prod.cql.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/server/templates/src/main/resources/config/cql/create-keyspace.cql.ejs b/generators/server/templates/src/main/resources/config/cql/create-keyspace.cql.ejs index acf0a36de2d9..2a1aa2b4f87d 100644 --- a/generators/server/templates/src/main/resources/config/cql/create-keyspace.cql.ejs +++ b/generators/server/templates/src/main/resources/config/cql/create-keyspace.cql.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/server/templates/src/main/resources/config/cql/drop-keyspace.cql.ejs b/generators/server/templates/src/main/resources/config/cql/drop-keyspace.cql.ejs index 1267308ceb12..e4fe63ca6121 100644 --- a/generators/server/templates/src/main/resources/config/cql/drop-keyspace.cql.ejs +++ b/generators/server/templates/src/main/resources/config/cql/drop-keyspace.cql.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/server/templates/src/main/resources/config/liquibase/changelog/initial_schema.xml.ejs b/generators/server/templates/src/main/resources/config/liquibase/changelog/initial_schema.xml.ejs index 4379044ebc46..b925f994c270 100644 --- a/generators/server/templates/src/main/resources/config/liquibase/changelog/initial_schema.xml.ejs +++ b/generators/server/templates/src/main/resources/config/liquibase/changelog/initial_schema.xml.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/server/templates/src/main/resources/i18n/messages.properties.ejs b/generators/server/templates/src/main/resources/i18n/messages.properties.ejs index b37973b749c1..c75ed29982cf 100644 --- a/generators/server/templates/src/main/resources/i18n/messages.properties.ejs +++ b/generators/server/templates/src/main/resources/i18n/messages.properties.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/server/templates/src/main/resources/logback-spring.xml.ejs b/generators/server/templates/src/main/resources/logback-spring.xml.ejs index b7379058785c..cec8f8a77e97 100644 --- a/generators/server/templates/src/main/resources/logback-spring.xml.ejs +++ b/generators/server/templates/src/main/resources/logback-spring.xml.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/server/templates/src/main/resources/swagger/api.yml.ejs b/generators/server/templates/src/main/resources/swagger/api.yml.ejs index d98b8c158d71..34237822fa57 100644 --- a/generators/server/templates/src/main/resources/swagger/api.yml.ejs +++ b/generators/server/templates/src/main/resources/swagger/api.yml.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/server/templates/src/test/java/package/AbstractCassandraTest.java.ejs b/generators/server/templates/src/test/java/package/AbstractCassandraTest.java.ejs index e8605c8a0a7a..b0a7fb9d76af 100644 --- a/generators/server/templates/src/test/java/package/AbstractCassandraTest.java.ejs +++ b/generators/server/templates/src/test/java/package/AbstractCassandraTest.java.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/server/templates/src/test/java/package/AbstractNeo4jIT.java.ejs b/generators/server/templates/src/test/java/package/AbstractNeo4jIT.java.ejs index 98ab1f908883..031ad22f9160 100644 --- a/generators/server/templates/src/test/java/package/AbstractNeo4jIT.java.ejs +++ b/generators/server/templates/src/test/java/package/AbstractNeo4jIT.java.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/server/templates/src/test/java/package/ArchTest.java.ejs b/generators/server/templates/src/test/java/package/ArchTest.java.ejs index 0400a5b56033..ec54b85da235 100644 --- a/generators/server/templates/src/test/java/package/ArchTest.java.ejs +++ b/generators/server/templates/src/test/java/package/ArchTest.java.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/server/templates/src/test/java/package/CassandraKeyspaceIT.java.ejs b/generators/server/templates/src/test/java/package/CassandraKeyspaceIT.java.ejs index acd5bd011962..7ed81ea30db3 100644 --- a/generators/server/templates/src/test/java/package/CassandraKeyspaceIT.java.ejs +++ b/generators/server/templates/src/test/java/package/CassandraKeyspaceIT.java.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/server/templates/src/test/java/package/ReactiveSqlTestContainerExtension.java.ejs b/generators/server/templates/src/test/java/package/ReactiveSqlTestContainerExtension.java.ejs index 4a058c1455e7..63f211069410 100644 --- a/generators/server/templates/src/test/java/package/ReactiveSqlTestContainerExtension.java.ejs +++ b/generators/server/templates/src/test/java/package/ReactiveSqlTestContainerExtension.java.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/server/templates/src/test/java/package/RedisTestContainerExtension.java.ejs b/generators/server/templates/src/test/java/package/RedisTestContainerExtension.java.ejs index 4a63cc84550f..5d166e0eb917 100644 --- a/generators/server/templates/src/test/java/package/RedisTestContainerExtension.java.ejs +++ b/generators/server/templates/src/test/java/package/RedisTestContainerExtension.java.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/server/templates/src/test/java/package/config/DatabaseConfigurationIT.java.ejs b/generators/server/templates/src/test/java/package/config/DatabaseConfigurationIT.java.ejs index 7114ee55eb3f..2520ad537460 100644 --- a/generators/server/templates/src/test/java/package/config/DatabaseConfigurationIT.java.ejs +++ b/generators/server/templates/src/test/java/package/config/DatabaseConfigurationIT.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/test/java/package/config/JHipsterBlockHoundIntegration.java.ejs b/generators/server/templates/src/test/java/package/config/JHipsterBlockHoundIntegration.java.ejs index 8b13aa18024c..a4cfad7ba179 100644 --- a/generators/server/templates/src/test/java/package/config/JHipsterBlockHoundIntegration.java.ejs +++ b/generators/server/templates/src/test/java/package/config/JHipsterBlockHoundIntegration.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/test/java/package/config/NoOpMailConfiguration.java.ejs b/generators/server/templates/src/test/java/package/config/NoOpMailConfiguration.java.ejs index 88c9c261c357..b4f9226aafe4 100644 --- a/generators/server/templates/src/test/java/package/config/NoOpMailConfiguration.java.ejs +++ b/generators/server/templates/src/test/java/package/config/NoOpMailConfiguration.java.ejs @@ -1,20 +1,20 @@ <%# -Copyright 2013-2020 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. -This file is part of the JHipster project, see https://jhipster.github.io/ -for more information. + 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"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + 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, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -%> package <%=packageName%>.config; diff --git a/generators/server/templates/src/test/java/package/config/OAuth2TestConfiguration.java.ejs b/generators/server/templates/src/test/java/package/config/OAuth2TestConfiguration.java.ejs index 7117247eea07..99726e8d4141 100644 --- a/generators/server/templates/src/test/java/package/config/OAuth2TestConfiguration.java.ejs +++ b/generators/server/templates/src/test/java/package/config/OAuth2TestConfiguration.java.ejs @@ -1,20 +1,20 @@ <%# -Copyright 2013-2020 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. -This file is part of the JHipster project, see https://jhipster.github.io/ -for more information. + 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"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + 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, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -%> package <%=packageName%>.config; diff --git a/generators/server/templates/src/test/java/package/config/SecurityBeanOverrideConfiguration.java.ejs b/generators/server/templates/src/test/java/package/config/SecurityBeanOverrideConfiguration.java.ejs index 91615a23d46b..506ab838cf79 100644 --- a/generators/server/templates/src/test/java/package/config/SecurityBeanOverrideConfiguration.java.ejs +++ b/generators/server/templates/src/test/java/package/config/SecurityBeanOverrideConfiguration.java.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/server/templates/src/test/java/package/config/StaticResourcesWebConfigurerTest.java.ejs b/generators/server/templates/src/test/java/package/config/StaticResourcesWebConfigurerTest.java.ejs index 140c516a16a2..739903e02d2d 100644 --- a/generators/server/templates/src/test/java/package/config/StaticResourcesWebConfigurerTest.java.ejs +++ b/generators/server/templates/src/test/java/package/config/StaticResourcesWebConfigurerTest.java.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/server/templates/src/test/java/package/config/TestSecurityConfiguration.java.ejs b/generators/server/templates/src/test/java/package/config/TestSecurityConfiguration.java.ejs index 54ee66a38952..94b7d571fa3f 100644 --- a/generators/server/templates/src/test/java/package/config/TestSecurityConfiguration.java.ejs +++ b/generators/server/templates/src/test/java/package/config/TestSecurityConfiguration.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/test/java/package/config/WebConfigurerTest.java.ejs b/generators/server/templates/src/test/java/package/config/WebConfigurerTest.java.ejs index 2666a0393643..a71e48928ad4 100644 --- a/generators/server/templates/src/test/java/package/config/WebConfigurerTest.java.ejs +++ b/generators/server/templates/src/test/java/package/config/WebConfigurerTest.java.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/server/templates/src/test/java/package/config/WebConfigurerTestController.java.ejs b/generators/server/templates/src/test/java/package/config/WebConfigurerTestController.java.ejs index f1f878d8e0e0..858d84b1ebdf 100644 --- a/generators/server/templates/src/test/java/package/config/WebConfigurerTestController.java.ejs +++ b/generators/server/templates/src/test/java/package/config/WebConfigurerTestController.java.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/server/templates/src/test/java/package/config/timezone/HibernateTimeZoneIT.java.ejs b/generators/server/templates/src/test/java/package/config/timezone/HibernateTimeZoneIT.java.ejs index 7213629af7bc..2bd5b6544ed3 100644 --- a/generators/server/templates/src/test/java/package/config/timezone/HibernateTimeZoneIT.java.ejs +++ b/generators/server/templates/src/test/java/package/config/timezone/HibernateTimeZoneIT.java.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/server/templates/src/test/java/package/cucumber/CucumberIT.java.ejs b/generators/server/templates/src/test/java/package/cucumber/CucumberIT.java.ejs index 51a4706f3c7d..0c56eb9beb80 100644 --- a/generators/server/templates/src/test/java/package/cucumber/CucumberIT.java.ejs +++ b/generators/server/templates/src/test/java/package/cucumber/CucumberIT.java.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/server/templates/src/test/java/package/cucumber/CucumberTestContextConfiguration.java.ejs b/generators/server/templates/src/test/java/package/cucumber/CucumberTestContextConfiguration.java.ejs index 98eeb18d4468..58db7fb70316 100644 --- a/generators/server/templates/src/test/java/package/cucumber/CucumberTestContextConfiguration.java.ejs +++ b/generators/server/templates/src/test/java/package/cucumber/CucumberTestContextConfiguration.java.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/server/templates/src/test/java/package/cucumber/stepdefs/StepDefs.java.ejs b/generators/server/templates/src/test/java/package/cucumber/stepdefs/StepDefs.java.ejs index 0554fd831551..7a82ac792a08 100644 --- a/generators/server/templates/src/test/java/package/cucumber/stepdefs/StepDefs.java.ejs +++ b/generators/server/templates/src/test/java/package/cucumber/stepdefs/StepDefs.java.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/server/templates/src/test/java/package/cucumber/stepdefs/UserStepDefs.java.ejs b/generators/server/templates/src/test/java/package/cucumber/stepdefs/UserStepDefs.java.ejs index 12f264af5f09..ce076d347525 100644 --- a/generators/server/templates/src/test/java/package/cucumber/stepdefs/UserStepDefs.java.ejs +++ b/generators/server/templates/src/test/java/package/cucumber/stepdefs/UserStepDefs.java.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/server/templates/src/test/java/package/gateway/responserewriting/SwaggerBasePathRewritingFilterTest.java.ejs b/generators/server/templates/src/test/java/package/gateway/responserewriting/SwaggerBasePathRewritingFilterTest.java.ejs index a102306c2cd3..ddb48f79c0bf 100644 --- a/generators/server/templates/src/test/java/package/gateway/responserewriting/SwaggerBasePathRewritingFilterTest.java.ejs +++ b/generators/server/templates/src/test/java/package/gateway/responserewriting/SwaggerBasePathRewritingFilterTest.java.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/server/templates/src/test/java/package/repository/CustomN1qlCouchbaseRepositoryTest.java.ejs b/generators/server/templates/src/test/java/package/repository/CustomN1qlCouchbaseRepositoryTest.java.ejs index c174156a5d0a..6a9f4b794a57 100644 --- a/generators/server/templates/src/test/java/package/repository/CustomN1qlCouchbaseRepositoryTest.java.ejs +++ b/generators/server/templates/src/test/java/package/repository/CustomN1qlCouchbaseRepositoryTest.java.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/server/templates/src/test/java/package/repository/search/UserSearchRepositoryMockConfiguration.java.ejs b/generators/server/templates/src/test/java/package/repository/search/UserSearchRepositoryMockConfiguration.java.ejs index c8d95975005e..84c154a4fa63 100644 --- a/generators/server/templates/src/test/java/package/repository/search/UserSearchRepositoryMockConfiguration.java.ejs +++ b/generators/server/templates/src/test/java/package/repository/search/UserSearchRepositoryMockConfiguration.java.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/server/templates/src/test/java/package/repository/timezone/DateTimeWrapper.java.ejs b/generators/server/templates/src/test/java/package/repository/timezone/DateTimeWrapper.java.ejs index 1ff7c0d331b5..8101063f6c50 100644 --- a/generators/server/templates/src/test/java/package/repository/timezone/DateTimeWrapper.java.ejs +++ b/generators/server/templates/src/test/java/package/repository/timezone/DateTimeWrapper.java.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/server/templates/src/test/java/package/repository/timezone/DateTimeWrapperRepository.java.ejs b/generators/server/templates/src/test/java/package/repository/timezone/DateTimeWrapperRepository.java.ejs index 46ec142be289..e003adb38918 100644 --- a/generators/server/templates/src/test/java/package/repository/timezone/DateTimeWrapperRepository.java.ejs +++ b/generators/server/templates/src/test/java/package/repository/timezone/DateTimeWrapperRepository.java.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/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.ejs b/generators/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.ejs index 1af2d0696a1f..174bdf6a3189 100644 --- a/generators/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.ejs +++ b/generators/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.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/server/templates/src/test/java/package/security/OAuth2TokenMockUtil.java.ejs b/generators/server/templates/src/test/java/package/security/OAuth2TokenMockUtil.java.ejs index acae94c38a16..045db756efb8 100644 --- a/generators/server/templates/src/test/java/package/security/OAuth2TokenMockUtil.java.ejs +++ b/generators/server/templates/src/test/java/package/security/OAuth2TokenMockUtil.java.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/server/templates/src/test/java/package/security/SecurityUtilsUnitTest.java.ejs b/generators/server/templates/src/test/java/package/security/SecurityUtilsUnitTest.java.ejs index 13dc171967c2..95ffbd0fabc9 100644 --- a/generators/server/templates/src/test/java/package/security/SecurityUtilsUnitTest.java.ejs +++ b/generators/server/templates/src/test/java/package/security/SecurityUtilsUnitTest.java.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/server/templates/src/test/java/package/security/jwt/JWTFilterTest.java.ejs b/generators/server/templates/src/test/java/package/security/jwt/JWTFilterTest.java.ejs index 933bb16abf96..621db029cb06 100644 --- a/generators/server/templates/src/test/java/package/security/jwt/JWTFilterTest.java.ejs +++ b/generators/server/templates/src/test/java/package/security/jwt/JWTFilterTest.java.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/server/templates/src/test/java/package/security/jwt/TokenProviderTest.java.ejs b/generators/server/templates/src/test/java/package/security/jwt/TokenProviderTest.java.ejs index 49898688842e..921fb72304d2 100644 --- a/generators/server/templates/src/test/java/package/security/jwt/TokenProviderTest.java.ejs +++ b/generators/server/templates/src/test/java/package/security/jwt/TokenProviderTest.java.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/server/templates/src/test/java/package/security/oauth2/AudienceValidatorTest.java.ejs b/generators/server/templates/src/test/java/package/security/oauth2/AudienceValidatorTest.java.ejs index 2074a4803c3b..2b13a647202c 100644 --- a/generators/server/templates/src/test/java/package/security/oauth2/AudienceValidatorTest.java.ejs +++ b/generators/server/templates/src/test/java/package/security/oauth2/AudienceValidatorTest.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/test/java/package/security/oauth2/AuthorizationHeaderUtilTest.java.ejs b/generators/server/templates/src/test/java/package/security/oauth2/AuthorizationHeaderUtilTest.java.ejs index c1992109c3dc..bfe953de84de 100644 --- a/generators/server/templates/src/test/java/package/security/oauth2/AuthorizationHeaderUtilTest.java.ejs +++ b/generators/server/templates/src/test/java/package/security/oauth2/AuthorizationHeaderUtilTest.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/test/java/package/security/oauth2/CookieCollectionTest.java.ejs b/generators/server/templates/src/test/java/package/security/oauth2/CookieCollectionTest.java.ejs index d744ba1b5a38..ff17ddbbe6aa 100644 --- a/generators/server/templates/src/test/java/package/security/oauth2/CookieCollectionTest.java.ejs +++ b/generators/server/templates/src/test/java/package/security/oauth2/CookieCollectionTest.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/test/java/package/security/oauth2/CookieTokenExtractorTest.java.ejs b/generators/server/templates/src/test/java/package/security/oauth2/CookieTokenExtractorTest.java.ejs index 1177a834372f..4e032dc33b23 100644 --- a/generators/server/templates/src/test/java/package/security/oauth2/CookieTokenExtractorTest.java.ejs +++ b/generators/server/templates/src/test/java/package/security/oauth2/CookieTokenExtractorTest.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/test/java/package/security/oauth2/OAuth2AuthenticationServiceTest.java.ejs b/generators/server/templates/src/test/java/package/security/oauth2/OAuth2AuthenticationServiceTest.java.ejs index 116b3808f755..6b5825d4c225 100644 --- a/generators/server/templates/src/test/java/package/security/oauth2/OAuth2AuthenticationServiceTest.java.ejs +++ b/generators/server/templates/src/test/java/package/security/oauth2/OAuth2AuthenticationServiceTest.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/test/java/package/security/oauth2/OAuth2CookieHelperTest.java.ejs b/generators/server/templates/src/test/java/package/security/oauth2/OAuth2CookieHelperTest.java.ejs index 9092c246f0b6..cb2d2b9aa4b3 100644 --- a/generators/server/templates/src/test/java/package/security/oauth2/OAuth2CookieHelperTest.java.ejs +++ b/generators/server/templates/src/test/java/package/security/oauth2/OAuth2CookieHelperTest.java.ejs @@ -1,14 +1,14 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see https://jhipster.github.io/ + 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"); 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/server/templates/src/test/java/package/service/MailServiceIT.java.ejs b/generators/server/templates/src/test/java/package/service/MailServiceIT.java.ejs index adff363eb03b..8ef4e1f8dc21 100644 --- a/generators/server/templates/src/test/java/package/service/MailServiceIT.java.ejs +++ b/generators/server/templates/src/test/java/package/service/MailServiceIT.java.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/server/templates/src/test/java/package/service/UserServiceIT.java.ejs b/generators/server/templates/src/test/java/package/service/UserServiceIT.java.ejs index a9887ecdc635..3b845c698b95 100644 --- a/generators/server/templates/src/test/java/package/service/UserServiceIT.java.ejs +++ b/generators/server/templates/src/test/java/package/service/UserServiceIT.java.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/server/templates/src/test/java/package/service/mapper/UserMapperTest.java.ejs b/generators/server/templates/src/test/java/package/service/mapper/UserMapperTest.java.ejs index 777e4e9ff6a6..6b0440705e95 100644 --- a/generators/server/templates/src/test/java/package/service/mapper/UserMapperTest.java.ejs +++ b/generators/server/templates/src/test/java/package/service/mapper/UserMapperTest.java.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/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs b/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs index c8f8a87d7487..1399cdf8bad3 100644 --- a/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs +++ b/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.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/server/templates/src/test/java/package/web/rest/AccountResourceIT_oauth2.java.ejs b/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_oauth2.java.ejs index 0557122bdcbf..5d61b03d7596 100644 --- a/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_oauth2.java.ejs +++ b/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_oauth2.java.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/server/templates/src/test/java/package/web/rest/AccountResourceIT_skipUserManagement.java.ejs b/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_skipUserManagement.java.ejs index 05692f074a78..06b94fcf0815 100644 --- a/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_skipUserManagement.java.ejs +++ b/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_skipUserManagement.java.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/server/templates/src/test/java/package/web/rest/ClientForwardControllerTest.java.ejs b/generators/server/templates/src/test/java/package/web/rest/ClientForwardControllerTest.java.ejs index 507523403542..030d49bd520b 100644 --- a/generators/server/templates/src/test/java/package/web/rest/ClientForwardControllerTest.java.ejs +++ b/generators/server/templates/src/test/java/package/web/rest/ClientForwardControllerTest.java.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/server/templates/src/test/java/package/web/rest/KafkaResourceIT.java.ejs b/generators/server/templates/src/test/java/package/web/rest/KafkaResourceIT.java.ejs index 54e0091fdd97..024e8e0ea77d 100644 --- a/generators/server/templates/src/test/java/package/web/rest/KafkaResourceIT.java.ejs +++ b/generators/server/templates/src/test/java/package/web/rest/KafkaResourceIT.java.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/server/templates/src/test/java/package/web/rest/LogoutResourceIT.java.ejs b/generators/server/templates/src/test/java/package/web/rest/LogoutResourceIT.java.ejs index a4490f9a65f2..c6ae93d25a62 100644 --- a/generators/server/templates/src/test/java/package/web/rest/LogoutResourceIT.java.ejs +++ b/generators/server/templates/src/test/java/package/web/rest/LogoutResourceIT.java.ejs @@ -1,5 +1,5 @@ <%# - Copyright 2013-2018 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. This file is part of the JHipster project, see https://www.jhipster.tech/ for more information. @@ -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/server/templates/src/test/java/package/web/rest/TestUtil.java.ejs b/generators/server/templates/src/test/java/package/web/rest/TestUtil.java.ejs index 25243ffd7594..9e6e3785f416 100644 --- a/generators/server/templates/src/test/java/package/web/rest/TestUtil.java.ejs +++ b/generators/server/templates/src/test/java/package/web/rest/TestUtil.java.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/server/templates/src/test/java/package/web/rest/UserJWTControllerIT.java.ejs b/generators/server/templates/src/test/java/package/web/rest/UserJWTControllerIT.java.ejs index 91684b3c2e9e..f296aa1ef682 100644 --- a/generators/server/templates/src/test/java/package/web/rest/UserJWTControllerIT.java.ejs +++ b/generators/server/templates/src/test/java/package/web/rest/UserJWTControllerIT.java.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/server/templates/src/test/java/package/web/rest/UserResourceIT.java.ejs b/generators/server/templates/src/test/java/package/web/rest/UserResourceIT.java.ejs index 17cac3fffcdb..b430eb9b54e7 100644 --- a/generators/server/templates/src/test/java/package/web/rest/UserResourceIT.java.ejs +++ b/generators/server/templates/src/test/java/package/web/rest/UserResourceIT.java.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/server/templates/src/test/java/package/web/rest/WithUnauthenticatedMockUser.java.ejs b/generators/server/templates/src/test/java/package/web/rest/WithUnauthenticatedMockUser.java.ejs index 12c6964a68f4..ff7a772cb76d 100644 --- a/generators/server/templates/src/test/java/package/web/rest/WithUnauthenticatedMockUser.java.ejs +++ b/generators/server/templates/src/test/java/package/web/rest/WithUnauthenticatedMockUser.java.ejs @@ -1,20 +1,20 @@ <%# -Copyright 2013-2020 the original author or authors from the JHipster project. + Copyright 2013-2020 the original author or authors from the JHipster project. -This file is part of the JHipster project, see https://www.jhipster.tech/ -for more information. + 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"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + 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, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -%> package <%= packageName %>.web.rest; diff --git a/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT.java.ejs b/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT.java.ejs index 6eabacfcc286..eb51e1fc5fcd 100644 --- a/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT.java.ejs +++ b/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT.java.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/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorTestController.java.ejs b/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorTestController.java.ejs index e45e5aebbd21..7ac26fc8cab6 100644 --- a/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorTestController.java.ejs +++ b/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorTestController.java.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/server/templates/src/test/resources/config/application-testcontainers.yml.ejs b/generators/server/templates/src/test/resources/config/application-testcontainers.yml.ejs index 4571d58de454..e817bffa81c6 100644 --- a/generators/server/templates/src/test/resources/config/application-testcontainers.yml.ejs +++ b/generators/server/templates/src/test/resources/config/application-testcontainers.yml.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/server/templates/src/test/resources/config/application.yml.ejs b/generators/server/templates/src/test/resources/config/application.yml.ejs index cadc7bcd5c3c..a0b343677d25 100644 --- a/generators/server/templates/src/test/resources/config/application.yml.ejs +++ b/generators/server/templates/src/test/resources/config/application.yml.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/server/templates/src/test/resources/config/bootstrap.yml.ejs b/generators/server/templates/src/test/resources/config/bootstrap.yml.ejs index 39343e32cfa1..5460b8f2a238 100644 --- a/generators/server/templates/src/test/resources/config/bootstrap.yml.ejs +++ b/generators/server/templates/src/test/resources/config/bootstrap.yml.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/server/templates/src/test/resources/logback.xml.ejs b/generators/server/templates/src/test/resources/logback.xml.ejs index b4176c0374eb..6f1f10f5a75d 100644 --- a/generators/server/templates/src/test/resources/logback.xml.ejs +++ b/generators/server/templates/src/test/resources/logback.xml.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-controller/index.js b/generators/spring-controller/index.js index 66ecc5d155e6..15a152973f2d 100644 --- a/generators/spring-controller/index.js +++ b/generators/spring-controller/index.js @@ -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-controller/prompts.js b/generators/spring-controller/prompts.js index 12321074b0c3..6d84ebe35ffc 100644 --- a/generators/spring-controller/prompts.js +++ b/generators/spring-controller/prompts.js @@ -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-controller/templates/src/main/java/package/web/rest/Resource.java.ejs b/generators/spring-controller/templates/src/main/java/package/web/rest/Resource.java.ejs index a9e19918fa80..c753a41e3904 100644 --- a/generators/spring-controller/templates/src/main/java/package/web/rest/Resource.java.ejs +++ b/generators/spring-controller/templates/src/main/java/package/web/rest/Resource.java.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-controller/templates/src/test/java/package/web/rest/ResourceIT.java.ejs b/generators/spring-controller/templates/src/test/java/package/web/rest/ResourceIT.java.ejs index 731e2ee14334..cda90f6fa9cd 100644 --- a/generators/spring-controller/templates/src/test/java/package/web/rest/ResourceIT.java.ejs +++ b/generators/spring-controller/templates/src/test/java/package/web/rest/ResourceIT.java.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-service/index.js b/generators/spring-service/index.js index 6e788e9107f0..f5058e34adfc 100644 --- a/generators/spring-service/index.js +++ b/generators/spring-service/index.js @@ -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-service/templates/src/main/java/package/service/Service.java.ejs b/generators/spring-service/templates/src/main/java/package/service/Service.java.ejs index 4069a8fd7352..1661f908975e 100644 --- a/generators/spring-service/templates/src/main/java/package/service/Service.java.ejs +++ b/generators/spring-service/templates/src/main/java/package/service/Service.java.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-service/templates/src/main/java/package/service/impl/ServiceImpl.java.ejs b/generators/spring-service/templates/src/main/java/package/service/impl/ServiceImpl.java.ejs index 8f62bdce42e2..dd534ca464a4 100644 --- a/generators/spring-service/templates/src/main/java/package/service/impl/ServiceImpl.java.ejs +++ b/generators/spring-service/templates/src/main/java/package/service/impl/ServiceImpl.java.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/statistics.js b/generators/statistics.js index 64c32a4e7fec..164af3e81531 100644 --- a/generators/statistics.js +++ b/generators/statistics.js @@ -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/upgrade-config/index.js b/generators/upgrade-config/index.js index c5ad00e9550a..5fc42cd80f12 100644 --- a/generators/upgrade-config/index.js +++ b/generators/upgrade-config/index.js @@ -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/upgrade/index.js b/generators/upgrade/index.js index 597ad50cd2bd..68482bebaff3 100644 --- a/generators/upgrade/index.js +++ b/generators/upgrade/index.js @@ -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/utils.js b/generators/utils.js index bbdf9a00bdbd..6b3e568a382a 100644 --- a/generators/utils.js +++ b/generators/utils.js @@ -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/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.js b/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.js index 2cd1c4268dd7..fbcd9c5a59c0 100644 --- a/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.js +++ b/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/converters/jdl-to-json/jdl-to-json-field-converter.js b/jdl/converters/jdl-to-json/jdl-to-json-field-converter.js index 5296dbce5497..c8af312b64d2 100644 --- a/jdl/converters/jdl-to-json/jdl-to-json-field-converter.js +++ b/jdl/converters/jdl-to-json/jdl-to-json-field-converter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/converters/jdl-to-json/jdl-to-json-option-converter.js b/jdl/converters/jdl-to-json/jdl-to-json-option-converter.js index b46aca6bf4a2..c599c80c171a 100644 --- a/jdl/converters/jdl-to-json/jdl-to-json-option-converter.js +++ b/jdl/converters/jdl-to-json/jdl-to-json-option-converter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js b/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js index e7de37e916c0..c5fccdf430f6 100644 --- a/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js +++ b/jdl/converters/jdl-to-json/jdl-to-json-relationship-converter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.js b/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.js index afacb95463f9..7525b3c81733 100644 --- a/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.js +++ b/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.js b/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.js index 5f1d9b397189..9e0bf8969113 100644 --- a/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.js +++ b/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/converters/json-to-jdl-application-converter.js b/jdl/converters/json-to-jdl-application-converter.js index 5f27bbe5558e..a1dd95789461 100644 --- a/jdl/converters/json-to-jdl-application-converter.js +++ b/jdl/converters/json-to-jdl-application-converter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/converters/json-to-jdl-converter.js b/jdl/converters/json-to-jdl-converter.js index b850f1af9a0d..f7af9796e8ea 100644 --- a/jdl/converters/json-to-jdl-converter.js +++ b/jdl/converters/json-to-jdl-converter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/converters/json-to-jdl-entity-converter.js b/jdl/converters/json-to-jdl-entity-converter.js index ddc5bddba0a6..646fa734ef24 100644 --- a/jdl/converters/json-to-jdl-entity-converter.js +++ b/jdl/converters/json-to-jdl-entity-converter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/converters/json-to-jdl-option-converter.js b/jdl/converters/json-to-jdl-option-converter.js index ace015150194..c279fad16fb4 100644 --- a/jdl/converters/json-to-jdl-option-converter.js +++ b/jdl/converters/json-to-jdl-option-converter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/converters/parsed-jdl-to-jdl-object/application-converter.js b/jdl/converters/parsed-jdl-to-jdl-object/application-converter.js index 78a2d09c96e5..a75d9d171f6e 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/application-converter.js +++ b/jdl/converters/parsed-jdl-to-jdl-object/application-converter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.js b/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.js index e55191e006dc..b2d20d798dd6 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.js +++ b/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.js b/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.js index 5f8255d4d04f..210b245c253f 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.js +++ b/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.js b/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.js index 4aa22c110524..3f48dc5bd317 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.js +++ b/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/converters/parsed-jdl-to-jdl-object/field-converter.js b/jdl/converters/parsed-jdl-to-jdl-object/field-converter.js index ec21b806ecd6..387da07f7d18 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/field-converter.js +++ b/jdl/converters/parsed-jdl-to-jdl-object/field-converter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/converters/parsed-jdl-to-jdl-object/option-converter.js b/jdl/converters/parsed-jdl-to-jdl-object/option-converter.js index 167f6f165930..3abf7fee3bb8 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/option-converter.js +++ b/jdl/converters/parsed-jdl-to-jdl-object/option-converter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js b/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js index 9ac05ae64a8f..f5e60026f93d 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js +++ b/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.js b/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.js index 8a180e66c131..fcea5bf498ed 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.js +++ b/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.js b/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.js index fbc028e3e2d2..4229acd108d7 100644 --- a/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.js +++ b/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/exporters/applications/jhipster-application-exporter.js b/jdl/exporters/applications/jhipster-application-exporter.js index ece46bd1b99f..397138216f03 100644 --- a/jdl/exporters/applications/jhipster-application-exporter.js +++ b/jdl/exporters/applications/jhipster-application-exporter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/exporters/applications/jhipster-application-formatter.js b/jdl/exporters/applications/jhipster-application-formatter.js index f893716b2ae3..713b0b50b268 100644 --- a/jdl/exporters/applications/jhipster-application-formatter.js +++ b/jdl/exporters/applications/jhipster-application-formatter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/exporters/export-utils.js b/jdl/exporters/export-utils.js index a80d39a4f756..bca9a37aa380 100644 --- a/jdl/exporters/export-utils.js +++ b/jdl/exporters/export-utils.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/exporters/jdl-exporter.js b/jdl/exporters/jdl-exporter.js index edb29718c7f8..9fcd67b4e13b 100644 --- a/jdl/exporters/jdl-exporter.js +++ b/jdl/exporters/jdl-exporter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/exporters/jhipster-deployment-exporter.js b/jdl/exporters/jhipster-deployment-exporter.js index f00db067d710..1309d9fe2fad 100644 --- a/jdl/exporters/jhipster-deployment-exporter.js +++ b/jdl/exporters/jhipster-deployment-exporter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/exporters/jhipster-entity-exporter.js b/jdl/exporters/jhipster-entity-exporter.js index 152e68799681..834deeb91e50 100644 --- a/jdl/exporters/jhipster-entity-exporter.js +++ b/jdl/exporters/jhipster-entity-exporter.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jdl-importer.js b/jdl/jdl-importer.js index 2410ed2577b1..1c2f09292a2b 100644 --- a/jdl/jdl-importer.js +++ b/jdl/jdl-importer.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/application-options.js b/jdl/jhipster/application-options.js index 40c81b312904..633c695b6196 100644 --- a/jdl/jhipster/application-options.js +++ b/jdl/jhipster/application-options.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/application-types.js b/jdl/jhipster/application-types.js index ffd1e1d1f19e..463f65cd1933 100644 --- a/jdl/jhipster/application-types.js +++ b/jdl/jhipster/application-types.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/binary-options.js b/jdl/jhipster/binary-options.js index f02a9063f6d0..25e83b956644 100644 --- a/jdl/jhipster/binary-options.js +++ b/jdl/jhipster/binary-options.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/database-types.js b/jdl/jhipster/database-types.js index 3541229c2991..1f636ee17192 100644 --- a/jdl/jhipster/database-types.js +++ b/jdl/jhipster/database-types.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/default-application-options.js b/jdl/jhipster/default-application-options.js index 2e46f132f425..00b3191cae80 100644 --- a/jdl/jhipster/default-application-options.js +++ b/jdl/jhipster/default-application-options.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/deployment-options.js b/jdl/jhipster/deployment-options.js index 87ccae8c5037..8809473d6859 100644 --- a/jdl/jhipster/deployment-options.js +++ b/jdl/jhipster/deployment-options.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/entity-table-name-creator.js b/jdl/jhipster/entity-table-name-creator.js index cfb81b6fd847..5309aed8aef1 100644 --- a/jdl/jhipster/entity-table-name-creator.js +++ b/jdl/jhipster/entity-table-name-creator.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/field-types.js b/jdl/jhipster/field-types.js index 2ed03aed8715..1860f7a329fa 100644 --- a/jdl/jhipster/field-types.js +++ b/jdl/jhipster/field-types.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/json-entity.js b/jdl/jhipster/json-entity.js index 623523c94072..5e959c24f716 100644 --- a/jdl/jhipster/json-entity.js +++ b/jdl/jhipster/json-entity.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/relationship-options.js b/jdl/jhipster/relationship-options.js index 0d9aa8621aa9..c9cfa2a90851 100644 --- a/jdl/jhipster/relationship-options.js +++ b/jdl/jhipster/relationship-options.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/relationship-types.js b/jdl/jhipster/relationship-types.js index 55533e360abb..043dcd28564b 100644 --- a/jdl/jhipster/relationship-types.js +++ b/jdl/jhipster/relationship-types.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/reserved-keywords.js b/jdl/jhipster/reserved-keywords.js index dbce956fe590..09ea58a78249 100644 --- a/jdl/jhipster/reserved-keywords.js +++ b/jdl/jhipster/reserved-keywords.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/reserved-keywords/angular.js b/jdl/jhipster/reserved-keywords/angular.js index b2ea60d14298..f2a35545aa9c 100644 --- a/jdl/jhipster/reserved-keywords/angular.js +++ b/jdl/jhipster/reserved-keywords/angular.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/reserved-keywords/cassandra.js b/jdl/jhipster/reserved-keywords/cassandra.js index de6b53834b0a..e9a3b22e8131 100644 --- a/jdl/jhipster/reserved-keywords/cassandra.js +++ b/jdl/jhipster/reserved-keywords/cassandra.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/reserved-keywords/couchbase.js b/jdl/jhipster/reserved-keywords/couchbase.js index 589c9a1e4d2e..c90ea695eac7 100644 --- a/jdl/jhipster/reserved-keywords/couchbase.js +++ b/jdl/jhipster/reserved-keywords/couchbase.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/reserved-keywords/java.js b/jdl/jhipster/reserved-keywords/java.js index 0ff664844d52..0e5873e2073d 100644 --- a/jdl/jhipster/reserved-keywords/java.js +++ b/jdl/jhipster/reserved-keywords/java.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/reserved-keywords/jhipster.js b/jdl/jhipster/reserved-keywords/jhipster.js index 045f63fb3c60..3f4c6fbef384 100644 --- a/jdl/jhipster/reserved-keywords/jhipster.js +++ b/jdl/jhipster/reserved-keywords/jhipster.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/reserved-keywords/mssql.js b/jdl/jhipster/reserved-keywords/mssql.js index 7f884e855015..126c347b6606 100644 --- a/jdl/jhipster/reserved-keywords/mssql.js +++ b/jdl/jhipster/reserved-keywords/mssql.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/reserved-keywords/mysql.js b/jdl/jhipster/reserved-keywords/mysql.js index 1ba9b1d10d3b..491dc138dd3c 100644 --- a/jdl/jhipster/reserved-keywords/mysql.js +++ b/jdl/jhipster/reserved-keywords/mysql.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/reserved-keywords/neo4j.js b/jdl/jhipster/reserved-keywords/neo4j.js index fd9a92ca2fb9..e5b8aea7ce3d 100644 --- a/jdl/jhipster/reserved-keywords/neo4j.js +++ b/jdl/jhipster/reserved-keywords/neo4j.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/reserved-keywords/oracle.js b/jdl/jhipster/reserved-keywords/oracle.js index 6c1e82aaa095..4669a6b5a1bf 100644 --- a/jdl/jhipster/reserved-keywords/oracle.js +++ b/jdl/jhipster/reserved-keywords/oracle.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/reserved-keywords/postgresql.js b/jdl/jhipster/reserved-keywords/postgresql.js index ecd50a2ab0f1..bde76ce6af77 100644 --- a/jdl/jhipster/reserved-keywords/postgresql.js +++ b/jdl/jhipster/reserved-keywords/postgresql.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/reserved-keywords/typescript.js b/jdl/jhipster/reserved-keywords/typescript.js index 4a8753c354ec..9f092ed551a2 100644 --- a/jdl/jhipster/reserved-keywords/typescript.js +++ b/jdl/jhipster/reserved-keywords/typescript.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/unary-options.js b/jdl/jhipster/unary-options.js index ac408cccee3d..bb8806c6720e 100644 --- a/jdl/jhipster/unary-options.js +++ b/jdl/jhipster/unary-options.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/jhipster/validations.js b/jdl/jhipster/validations.js index 232c94dca12a..b12ac8b91a6a 100644 --- a/jdl/jhipster/validations.js +++ b/jdl/jhipster/validations.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/linters/entity-linter.js b/jdl/linters/entity-linter.js index 54d3c8bbc8f9..c495cf024382 100644 --- a/jdl/linters/entity-linter.js +++ b/jdl/linters/entity-linter.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/linters/enum-linter.js b/jdl/linters/enum-linter.js index b734acaef8b5..2401067e6b57 100644 --- a/jdl/linters/enum-linter.js +++ b/jdl/linters/enum-linter.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/linters/field-linter.js b/jdl/linters/field-linter.js index cb3c3faa8c85..1018594816a3 100644 --- a/jdl/linters/field-linter.js +++ b/jdl/linters/field-linter.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/linters/issues/abstract-issue.js b/jdl/linters/issues/abstract-issue.js index a9274741447e..316f8f1d5962 100644 --- a/jdl/linters/issues/abstract-issue.js +++ b/jdl/linters/issues/abstract-issue.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/linters/issues/entity-issue.js b/jdl/linters/issues/entity-issue.js index 0c653886dcd7..ea567a691613 100644 --- a/jdl/linters/issues/entity-issue.js +++ b/jdl/linters/issues/entity-issue.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/linters/issues/enum-issue.js b/jdl/linters/issues/enum-issue.js index 28c2d726a00f..88d7be3bd551 100644 --- a/jdl/linters/issues/enum-issue.js +++ b/jdl/linters/issues/enum-issue.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/linters/issues/field-issue.js b/jdl/linters/issues/field-issue.js index 9501b705f24a..9b8b191d339b 100644 --- a/jdl/linters/issues/field-issue.js +++ b/jdl/linters/issues/field-issue.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/linters/issues/issues.js b/jdl/linters/issues/issues.js index 60fa55147b59..703b527c5ee2 100644 --- a/jdl/linters/issues/issues.js +++ b/jdl/linters/issues/issues.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/linters/issues/relationship-issue.js b/jdl/linters/issues/relationship-issue.js index 19ff720a8003..7119ca701297 100644 --- a/jdl/linters/issues/relationship-issue.js +++ b/jdl/linters/issues/relationship-issue.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/linters/jdl-linter.js b/jdl/linters/jdl-linter.js index 30c609072a7c..5f51734c576d 100644 --- a/jdl/linters/jdl-linter.js +++ b/jdl/linters/jdl-linter.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/linters/relationship-linter.js b/jdl/linters/relationship-linter.js index 6f3a280d1040..29e80c472834 100644 --- a/jdl/linters/relationship-linter.js +++ b/jdl/linters/relationship-linter.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/linters/rule-levels.js b/jdl/linters/rule-levels.js index 8778b329e31f..7bc6ce776efe 100644 --- a/jdl/linters/rule-levels.js +++ b/jdl/linters/rule-levels.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/linters/rule.js b/jdl/linters/rule.js index 537ba3edda38..9f794896e3ea 100644 --- a/jdl/linters/rule.js +++ b/jdl/linters/rule.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/linters/rules.js b/jdl/linters/rules.js index e1dd300c7095..e84e2ef0bf62 100644 --- a/jdl/linters/rules.js +++ b/jdl/linters/rules.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/abstract-jdl-option.js b/jdl/models/abstract-jdl-option.js index 6e96e851344a..e50a988fe80a 100644 --- a/jdl/models/abstract-jdl-option.js +++ b/jdl/models/abstract-jdl-option.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/boolean-jdl-application-configuration-option.js b/jdl/models/boolean-jdl-application-configuration-option.js index 921df6dde748..9d5da8daf63a 100644 --- a/jdl/models/boolean-jdl-application-configuration-option.js +++ b/jdl/models/boolean-jdl-application-configuration-option.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/integer-jdl-application-configuration-option.js b/jdl/models/integer-jdl-application-configuration-option.js index 1a2d0a4fafdf..8df3c54a935a 100644 --- a/jdl/models/integer-jdl-application-configuration-option.js +++ b/jdl/models/integer-jdl-application-configuration-option.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/jdl-application-configuration-factory.js b/jdl/models/jdl-application-configuration-factory.js index 8bf6c5b91ee5..75c3a56da0f3 100644 --- a/jdl/models/jdl-application-configuration-factory.js +++ b/jdl/models/jdl-application-configuration-factory.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/jdl-application-configuration-option.js b/jdl/models/jdl-application-configuration-option.js index 5dff45d972a5..d5df08a056d4 100644 --- a/jdl/models/jdl-application-configuration-option.js +++ b/jdl/models/jdl-application-configuration-option.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/jdl-application-configuration.js b/jdl/models/jdl-application-configuration.js index e7018953d711..1e9acfc6aa5b 100644 --- a/jdl/models/jdl-application-configuration.js +++ b/jdl/models/jdl-application-configuration.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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 = 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/jdl/models/jdl-application-entities.js b/jdl/models/jdl-application-entities.js index d734b99a833c..7f97e99641e8 100644 --- a/jdl/models/jdl-application-entities.js +++ b/jdl/models/jdl-application-entities.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/jdl-application-factory.js b/jdl/models/jdl-application-factory.js index 51309e85f036..3664a02b5b87 100644 --- a/jdl/models/jdl-application-factory.js +++ b/jdl/models/jdl-application-factory.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/jdl-application.js b/jdl/models/jdl-application.js index 7e47979a4ec1..fa1768459726 100644 --- a/jdl/models/jdl-application.js +++ b/jdl/models/jdl-application.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/jdl-binary-option.js b/jdl/models/jdl-binary-option.js index 51cc8a49f599..9dd5b37f7192 100644 --- a/jdl/models/jdl-binary-option.js +++ b/jdl/models/jdl-binary-option.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/jdl-deployment.js b/jdl/models/jdl-deployment.js index 68c015f2bc13..0ae63756a520 100644 --- a/jdl/models/jdl-deployment.js +++ b/jdl/models/jdl-deployment.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/jdl-entity.js b/jdl/models/jdl-entity.js index aa2ac653ba4f..22e890715150 100644 --- a/jdl/models/jdl-entity.js +++ b/jdl/models/jdl-entity.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/jdl-enum.js b/jdl/models/jdl-enum.js index 1a7a40cd62c3..d85abb80fb57 100644 --- a/jdl/models/jdl-enum.js +++ b/jdl/models/jdl-enum.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/jdl-enums.js b/jdl/models/jdl-enums.js index 2ee45a82ae21..9955a52b962d 100644 --- a/jdl/models/jdl-enums.js +++ b/jdl/models/jdl-enums.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/jdl-field.js b/jdl/models/jdl-field.js index df4e8c4e3a75..3c7e4ebe4574 100644 --- a/jdl/models/jdl-field.js +++ b/jdl/models/jdl-field.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/jdl-object-merger.js b/jdl/models/jdl-object-merger.js index 2cbe7bc1986b..bb00bb5699c7 100644 --- a/jdl/models/jdl-object-merger.js +++ b/jdl/models/jdl-object-merger.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/jdl-object.js b/jdl/models/jdl-object.js index 3eefe4adc1fb..92b66e4ec728 100644 --- a/jdl/models/jdl-object.js +++ b/jdl/models/jdl-object.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/jdl-options.js b/jdl/models/jdl-options.js index 479f6f015b81..c35e6400174d 100644 --- a/jdl/models/jdl-options.js +++ b/jdl/models/jdl-options.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/jdl-relationship.js b/jdl/models/jdl-relationship.js index 454ac9586d01..3e759d45210d 100644 --- a/jdl/models/jdl-relationship.js +++ b/jdl/models/jdl-relationship.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/jdl-relationships.js b/jdl/models/jdl-relationships.js index a82dc414f98c..f5196e1b5bb3 100644 --- a/jdl/models/jdl-relationships.js +++ b/jdl/models/jdl-relationships.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/jdl-unary-option.js b/jdl/models/jdl-unary-option.js index 22db9f1ffaff..55e2349a87e7 100644 --- a/jdl/models/jdl-unary-option.js +++ b/jdl/models/jdl-unary-option.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/jdl-validation.js b/jdl/models/jdl-validation.js index 0fa712d8621a..2dc7bb19ddef 100644 --- a/jdl/models/jdl-validation.js +++ b/jdl/models/jdl-validation.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/list-jdl-application-configuration-option.js b/jdl/models/list-jdl-application-configuration-option.js index eaaaa22ded09..3a50ae54341c 100644 --- a/jdl/models/list-jdl-application-configuration-option.js +++ b/jdl/models/list-jdl-application-configuration-option.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/models/string-jdl-application-configuration-option.js b/jdl/models/string-jdl-application-configuration-option.js index 7cd2873a3015..7562ac35fdbd 100644 --- a/jdl/models/string-jdl-application-configuration-option.js +++ b/jdl/models/string-jdl-application-configuration-option.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/parsing/api.js b/jdl/parsing/api.js index bf4609988599..353104536d9a 100644 --- a/jdl/parsing/api.js +++ b/jdl/parsing/api.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/parsing/exports.js b/jdl/parsing/exports.js index c2f08a925bcb..b9a2b560ad69 100644 --- a/jdl/parsing/exports.js +++ b/jdl/parsing/exports.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/parsing/generated/generated-serialized-grammar.js b/jdl/parsing/generated/generated-serialized-grammar.js index de9e3c6d8eb0..a26ec7461e2c 100644 --- a/jdl/parsing/generated/generated-serialized-grammar.js +++ b/jdl/parsing/generated/generated-serialized-grammar.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/parsing/jdl-ast-builder-visitor.js b/jdl/parsing/jdl-ast-builder-visitor.js index 8de88119b047..3189229f2993 100644 --- a/jdl/parsing/jdl-ast-builder-visitor.js +++ b/jdl/parsing/jdl-ast-builder-visitor.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/parsing/jdl-parser.js b/jdl/parsing/jdl-parser.js index 600f52a3282d..73399ceb12e9 100644 --- a/jdl/parsing/jdl-parser.js +++ b/jdl/parsing/jdl-parser.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/parsing/jdl-post-parsing-tasks.js b/jdl/parsing/jdl-post-parsing-tasks.js index 68d82b496b13..2e9261433d88 100644 --- a/jdl/parsing/jdl-post-parsing-tasks.js +++ b/jdl/parsing/jdl-post-parsing-tasks.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/parsing/lexer/application-tokens.js b/jdl/parsing/lexer/application-tokens.js index 913c2317f588..efc8d6be95ba 100644 --- a/jdl/parsing/lexer/application-tokens.js +++ b/jdl/parsing/lexer/application-tokens.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/parsing/lexer/deployment-tokens.js b/jdl/parsing/lexer/deployment-tokens.js index f15830e833ca..46d229bc7a0f 100644 --- a/jdl/parsing/lexer/deployment-tokens.js +++ b/jdl/parsing/lexer/deployment-tokens.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/parsing/lexer/lexer.js b/jdl/parsing/lexer/lexer.js index b7b94197b248..6cd74f7dade2 100644 --- a/jdl/parsing/lexer/lexer.js +++ b/jdl/parsing/lexer/lexer.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/parsing/lexer/minmax-tokens.js b/jdl/parsing/lexer/minmax-tokens.js index e50bd8e8b09b..efc44efa3e67 100644 --- a/jdl/parsing/lexer/minmax-tokens.js +++ b/jdl/parsing/lexer/minmax-tokens.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/parsing/lexer/option-tokens.js b/jdl/parsing/lexer/option-tokens.js index 19c71784c579..b735ad259536 100644 --- a/jdl/parsing/lexer/option-tokens.js +++ b/jdl/parsing/lexer/option-tokens.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/parsing/lexer/relationship-type-tokens.js b/jdl/parsing/lexer/relationship-type-tokens.js index 0f2d89eda991..bef794731d98 100644 --- a/jdl/parsing/lexer/relationship-type-tokens.js +++ b/jdl/parsing/lexer/relationship-type-tokens.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/parsing/lexer/shared-tokens.js b/jdl/parsing/lexer/shared-tokens.js index b7c2e097c02c..cb0429ffdcfb 100644 --- a/jdl/parsing/lexer/shared-tokens.js +++ b/jdl/parsing/lexer/shared-tokens.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/parsing/lexer/token-creator.js b/jdl/parsing/lexer/token-creator.js index f8121d90b2df..997f7c7194ca 100644 --- a/jdl/parsing/lexer/token-creator.js +++ b/jdl/parsing/lexer/token-creator.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/parsing/lexer/validation-tokens.js b/jdl/parsing/lexer/validation-tokens.js index 82355a9155e6..dd9aecadcef2 100644 --- a/jdl/parsing/lexer/validation-tokens.js +++ b/jdl/parsing/lexer/validation-tokens.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/parsing/self-checks/parsing-system-checker.js b/jdl/parsing/self-checks/parsing-system-checker.js index e07a3310ee89..dbfc69da1182 100644 --- a/jdl/parsing/self-checks/parsing-system-checker.js +++ b/jdl/parsing/self-checks/parsing-system-checker.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/parsing/self-checks/token-collector-visitor.js b/jdl/parsing/self-checks/token-collector-visitor.js index 2b400e769bff..5eca8e188802 100644 --- a/jdl/parsing/self-checks/token-collector-visitor.js +++ b/jdl/parsing/self-checks/token-collector-visitor.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/parsing/validator.js b/jdl/parsing/validator.js index 48d5c1f8bb82..a74cfa912f57 100644 --- a/jdl/parsing/validator.js +++ b/jdl/parsing/validator.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/readers/file-reader.js b/jdl/readers/file-reader.js index 8cdf5abcb7b9..0f85a52d3ad0 100644 --- a/jdl/readers/file-reader.js +++ b/jdl/readers/file-reader.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/readers/jdl-reader.js b/jdl/readers/jdl-reader.js index 71e85ab86608..3fba25419152 100644 --- a/jdl/readers/jdl-reader.js +++ b/jdl/readers/jdl-reader.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/readers/json-file-reader.js b/jdl/readers/json-file-reader.js index e9ea6d5fb61c..f707832ee659 100644 --- a/jdl/readers/json-file-reader.js +++ b/jdl/readers/json-file-reader.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/readers/json-reader.js b/jdl/readers/json-reader.js index b4acb163db5d..169f22f810ac 100644 --- a/jdl/readers/json-reader.js +++ b/jdl/readers/json-reader.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/utils/array-utils.js b/jdl/utils/array-utils.js index 06095cc7ae7e..73f6e7d98c63 100644 --- a/jdl/utils/array-utils.js +++ b/jdl/utils/array-utils.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/utils/deprecation-utils.js b/jdl/utils/deprecation-utils.js index 8af10664ad82..d81e4705bda1 100644 --- a/jdl/utils/deprecation-utils.js +++ b/jdl/utils/deprecation-utils.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/utils/file-utils.js b/jdl/utils/file-utils.js index 3b8dfc119e3d..5bf6bf417724 100644 --- a/jdl/utils/file-utils.js +++ b/jdl/utils/file-utils.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/utils/format-utils.js b/jdl/utils/format-utils.js index 047bde631d35..8ad38ac54c3a 100644 --- a/jdl/utils/format-utils.js +++ b/jdl/utils/format-utils.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/utils/object-utils.js b/jdl/utils/object-utils.js index ed68bf4d15c5..4deba39daff6 100644 --- a/jdl/utils/object-utils.js +++ b/jdl/utils/object-utils.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/utils/objects/logger.js b/jdl/utils/objects/logger.js index a8b6aa72450e..db341ae1e20b 100644 --- a/jdl/utils/objects/logger.js +++ b/jdl/utils/objects/logger.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/utils/set-utils.js b/jdl/utils/set-utils.js index 0dd34caece1f..cd6a74256a7a 100644 --- a/jdl/utils/set-utils.js +++ b/jdl/utils/set-utils.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/utils/string-utils.js b/jdl/utils/string-utils.js index 9aa4326f86c9..1a2d5e759413 100644 --- a/jdl/utils/string-utils.js +++ b/jdl/utils/string-utils.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/validators/application-validator.js b/jdl/validators/application-validator.js index e42c7a0a4706..6235c368bdc6 100644 --- a/jdl/validators/application-validator.js +++ b/jdl/validators/application-validator.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/validators/binary-option-validator.js b/jdl/validators/binary-option-validator.js index 345188734f67..4f861bd9bad0 100644 --- a/jdl/validators/binary-option-validator.js +++ b/jdl/validators/binary-option-validator.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/validators/deployment-validator.js b/jdl/validators/deployment-validator.js index 6979bacda31e..6cc55e8459b7 100644 --- a/jdl/validators/deployment-validator.js +++ b/jdl/validators/deployment-validator.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/validators/entity-validator.js b/jdl/validators/entity-validator.js index 387fc5a6f6b1..265958d27db5 100644 --- a/jdl/validators/entity-validator.js +++ b/jdl/validators/entity-validator.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/validators/enum-validator.js b/jdl/validators/enum-validator.js index 97bd2d37be77..fb4fc8bc98d8 100644 --- a/jdl/validators/enum-validator.js +++ b/jdl/validators/enum-validator.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/validators/field-validator.js b/jdl/validators/field-validator.js index b8005a9adb3d..25113e16dc2c 100644 --- a/jdl/validators/field-validator.js +++ b/jdl/validators/field-validator.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/validators/jdl-with-application-validator.js b/jdl/validators/jdl-with-application-validator.js index 7732dbe7656f..1cf77a9cbc89 100644 --- a/jdl/validators/jdl-with-application-validator.js +++ b/jdl/validators/jdl-with-application-validator.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/validators/jdl-without-application-validator.js b/jdl/validators/jdl-without-application-validator.js index d9a6889d9504..85ac82d62c49 100644 --- a/jdl/validators/jdl-without-application-validator.js +++ b/jdl/validators/jdl-without-application-validator.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/validators/option-validator.js b/jdl/validators/option-validator.js index 08d673bbbfcc..05c8f377aa69 100644 --- a/jdl/validators/option-validator.js +++ b/jdl/validators/option-validator.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/validators/relationship-validator.js b/jdl/validators/relationship-validator.js index 5193c5d23d34..5da012b6986b 100644 --- a/jdl/validators/relationship-validator.js +++ b/jdl/validators/relationship-validator.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/validators/unary-option-validator.js b/jdl/validators/unary-option-validator.js index a386c9567a42..42f3a8c8945f 100644 --- a/jdl/validators/unary-option-validator.js +++ b/jdl/validators/unary-option-validator.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/validators/validation-validator.js b/jdl/validators/validation-validator.js index 44ee7e2f7dc9..b46656b4fbe0 100644 --- a/jdl/validators/validation-validator.js +++ b/jdl/validators/validation-validator.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/jdl/validators/validator.js b/jdl/validators/validator.js index 7268a36973ea..078795a8e8a3 100644 --- a/jdl/validators/validator.js +++ b/jdl/validators/validator.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/cli/environment-builder.spec.js b/test/cli/environment-builder.spec.js index bcc54bd9140b..0d872ab75ec3 100644 --- a/test/cli/environment-builder.spec.js +++ b/test/cli/environment-builder.spec.js @@ -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/test/enforcements.spec.js b/test/enforcements.spec.js index 4811de579606..0b89c64a56d0 100644 --- a/test/enforcements.spec.js +++ b/test/enforcements.spec.js @@ -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/test/integration-test-reproducibility.spec.js b/test/integration-test-reproducibility.spec.js index 9f061d2df7c7..9408390f89dc 100644 --- a/test/integration-test-reproducibility.spec.js +++ b/test/integration-test-reproducibility.spec.js @@ -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/test/jdl/converters/JDLToJSON/jdl-to-json-basic-entity-information-converter.spec.js b/test/jdl/converters/JDLToJSON/jdl-to-json-basic-entity-information-converter.spec.js index c77f916c64ba..e696392674ba 100644 --- a/test/jdl/converters/JDLToJSON/jdl-to-json-basic-entity-information-converter.spec.js +++ b/test/jdl/converters/JDLToJSON/jdl-to-json-basic-entity-information-converter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/converters/JDLToJSON/jdl-to-json-field-converter.spec.js b/test/jdl/converters/JDLToJSON/jdl-to-json-field-converter.spec.js index 4ca0c0a696a3..13382b2d309a 100644 --- a/test/jdl/converters/JDLToJSON/jdl-to-json-field-converter.spec.js +++ b/test/jdl/converters/JDLToJSON/jdl-to-json-field-converter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/converters/JDLToJSON/jdl-to-json-option-converter.spec.js b/test/jdl/converters/JDLToJSON/jdl-to-json-option-converter.spec.js index 755ec45dff2a..7fd6abac35be 100644 --- a/test/jdl/converters/JDLToJSON/jdl-to-json-option-converter.spec.js +++ b/test/jdl/converters/JDLToJSON/jdl-to-json-option-converter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/converters/JDLToJSON/jdl-to-json-relationship-converter.spec.js b/test/jdl/converters/JDLToJSON/jdl-to-json-relationship-converter.spec.js index f05d942dc506..29ad2401c3ec 100644 --- a/test/jdl/converters/JDLToJSON/jdl-to-json-relationship-converter.spec.js +++ b/test/jdl/converters/JDLToJSON/jdl-to-json-relationship-converter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/converters/JDLToJSON/jdl-with-applications-to-json-converter.spec.js b/test/jdl/converters/JDLToJSON/jdl-with-applications-to-json-converter.spec.js index 4c29ffd80a52..d865db81a460 100644 --- a/test/jdl/converters/JDLToJSON/jdl-with-applications-to-json-converter.spec.js +++ b/test/jdl/converters/JDLToJSON/jdl-with-applications-to-json-converter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/converters/JDLToJSON/jdl-without-application-to-json-converter.spec.js b/test/jdl/converters/JDLToJSON/jdl-without-application-to-json-converter.spec.js index 20f83a52a415..05e972219af2 100644 --- a/test/jdl/converters/JDLToJSON/jdl-without-application-to-json-converter.spec.js +++ b/test/jdl/converters/JDLToJSON/jdl-without-application-to-json-converter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/converters/json-to-jdl-application-converter.spec.js b/test/jdl/converters/json-to-jdl-application-converter.spec.js index 8e9aed240e8a..fbda3aed1192 100644 --- a/test/jdl/converters/json-to-jdl-application-converter.spec.js +++ b/test/jdl/converters/json-to-jdl-application-converter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/converters/json-to-jdl-converter.spec.js b/test/jdl/converters/json-to-jdl-converter.spec.js index c7806ea4e4d6..1839cc09ac70 100644 --- a/test/jdl/converters/json-to-jdl-converter.spec.js +++ b/test/jdl/converters/json-to-jdl-converter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/converters/json-to-jdl-entity-converter.spec.js b/test/jdl/converters/json-to-jdl-entity-converter.spec.js index 3a481d2fd81a..4b23a483bf28 100644 --- a/test/jdl/converters/json-to-jdl-entity-converter.spec.js +++ b/test/jdl/converters/json-to-jdl-entity-converter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/converters/json-to-jdl-option-converter.spec.js b/test/jdl/converters/json-to-jdl-option-converter.spec.js index 731b7561f44f..74de3156ea6c 100644 --- a/test/jdl/converters/json-to-jdl-option-converter.spec.js +++ b/test/jdl/converters/json-to-jdl-option-converter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/converters/parsedJDLToJDLObject/application-converter.spec.js b/test/jdl/converters/parsedJDLToJDLObject/application-converter.spec.js index 151454dcfd69..a76e4f6ea56c 100644 --- a/test/jdl/converters/parsedJDLToJDLObject/application-converter.spec.js +++ b/test/jdl/converters/parsedJDLToJDLObject/application-converter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/converters/parsedJDLToJDLObject/deployment-converter.spec.js b/test/jdl/converters/parsedJDLToJDLObject/deployment-converter.spec.js index 5894ea7545a0..6b4581a39d09 100644 --- a/test/jdl/converters/parsedJDLToJDLObject/deployment-converter.spec.js +++ b/test/jdl/converters/parsedJDLToJDLObject/deployment-converter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/converters/parsedJDLToJDLObject/entity-converter.spec.js b/test/jdl/converters/parsedJDLToJDLObject/entity-converter.spec.js index a2f3a4f5d55e..2e9e36f4f5a7 100644 --- a/test/jdl/converters/parsedJDLToJDLObject/entity-converter.spec.js +++ b/test/jdl/converters/parsedJDLToJDLObject/entity-converter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/converters/parsedJDLToJDLObject/enum-converter.spec.js b/test/jdl/converters/parsedJDLToJDLObject/enum-converter.spec.js index ed48e468f9c9..e76b500438fb 100644 --- a/test/jdl/converters/parsedJDLToJDLObject/enum-converter.spec.js +++ b/test/jdl/converters/parsedJDLToJDLObject/enum-converter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/converters/parsedJDLToJDLObject/field-converter.spec.js b/test/jdl/converters/parsedJDLToJDLObject/field-converter.spec.js index 2950c6af771a..312e3dc52c13 100644 --- a/test/jdl/converters/parsedJDLToJDLObject/field-converter.spec.js +++ b/test/jdl/converters/parsedJDLToJDLObject/field-converter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/converters/parsedJDLToJDLObject/option-converter.spec.js b/test/jdl/converters/parsedJDLToJDLObject/option-converter.spec.js index 7eb378ca5d6a..5b32ebf338e5 100644 --- a/test/jdl/converters/parsedJDLToJDLObject/option-converter.spec.js +++ b/test/jdl/converters/parsedJDLToJDLObject/option-converter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/converters/parsedJDLToJDLObject/parsed-jdl-to-jdl-object-converter.spec.js b/test/jdl/converters/parsedJDLToJDLObject/parsed-jdl-to-jdl-object-converter.spec.js index 4a98a72b78f9..8206151558e9 100644 --- a/test/jdl/converters/parsedJDLToJDLObject/parsed-jdl-to-jdl-object-converter.spec.js +++ b/test/jdl/converters/parsedJDLToJDLObject/parsed-jdl-to-jdl-object-converter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/converters/parsedJDLToJDLObject/relationship-converter.spec.js b/test/jdl/converters/parsedJDLToJDLObject/relationship-converter.spec.js index 7a632193f652..29224da37684 100644 --- a/test/jdl/converters/parsedJDLToJDLObject/relationship-converter.spec.js +++ b/test/jdl/converters/parsedJDLToJDLObject/relationship-converter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/converters/parsedJDLToJDLObject/validation-converter.spec.js b/test/jdl/converters/parsedJDLToJDLObject/validation-converter.spec.js index 1adbce3dfffe..89b57069f02f 100644 --- a/test/jdl/converters/parsedJDLToJDLObject/validation-converter.spec.js +++ b/test/jdl/converters/parsedJDLToJDLObject/validation-converter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/exporters/export-utils.spec.js b/test/jdl/exporters/export-utils.spec.js index 483244639d5c..387e96f8bff2 100644 --- a/test/jdl/exporters/export-utils.spec.js +++ b/test/jdl/exporters/export-utils.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/exporters/jdl-exporter.spec.js b/test/jdl/exporters/jdl-exporter.spec.js index 8e5b8382633e..7402aac78ffd 100644 --- a/test/jdl/exporters/jdl-exporter.spec.js +++ b/test/jdl/exporters/jdl-exporter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/exporters/jhipster-application-exporter.spec.js b/test/jdl/exporters/jhipster-application-exporter.spec.js index b71169f689a4..571c37f75c50 100644 --- a/test/jdl/exporters/jhipster-application-exporter.spec.js +++ b/test/jdl/exporters/jhipster-application-exporter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/exporters/jhipster-deployment-exporter.spec.js b/test/jdl/exporters/jhipster-deployment-exporter.spec.js index 9ab284a82c57..14aabee7681e 100644 --- a/test/jdl/exporters/jhipster-deployment-exporter.spec.js +++ b/test/jdl/exporters/jhipster-deployment-exporter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/exporters/jhipster-entity-exporter.spec.js b/test/jdl/exporters/jhipster-entity-exporter.spec.js index c715ee9c3258..ff25db00e04e 100644 --- a/test/jdl/exporters/jhipster-entity-exporter.spec.js +++ b/test/jdl/exporters/jhipster-entity-exporter.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/grammar/dsl-api.spec.js b/test/jdl/grammar/dsl-api.spec.js index b6cee1613fc6..4ec769670314 100644 --- a/test/jdl/grammar/dsl-api.spec.js +++ b/test/jdl/grammar/dsl-api.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/grammar/grammar.spec.js b/test/jdl/grammar/grammar.spec.js index 019629e8f6b4..2d36516cf80c 100644 --- a/test/jdl/grammar/grammar.spec.js +++ b/test/jdl/grammar/grammar.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/grammar/lexer.spec.js b/test/jdl/grammar/lexer.spec.js index a90760765db2..43861b126017 100644 --- a/test/jdl/grammar/lexer.spec.js +++ b/test/jdl/grammar/lexer.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/grammar/validator.spec.js b/test/jdl/grammar/validator.spec.js index cd45512e8a8b..2903c22514a1 100644 --- a/test/jdl/grammar/validator.spec.js +++ b/test/jdl/grammar/validator.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/integration/test.spec.js b/test/jdl/integration/test.spec.js index dac312e50019..dc5b457d9b68 100644 --- a/test/jdl/integration/test.spec.js +++ b/test/jdl/integration/test.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/jdl-importer.spec.js b/test/jdl/jdl-importer.spec.js index 8662975a4c8a..f99c4f883074 100644 --- a/test/jdl/jdl-importer.spec.js +++ b/test/jdl/jdl-importer.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/jhipster/application-options.spec.js b/test/jdl/jhipster/application-options.spec.js index 223cb71332a3..88d8d2b5d8c4 100644 --- a/test/jdl/jhipster/application-options.spec.js +++ b/test/jdl/jhipster/application-options.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/jhipster/application-types.spec.js b/test/jdl/jhipster/application-types.spec.js index f94cdfc01d95..93f7dc8c6552 100644 --- a/test/jdl/jhipster/application-types.spec.js +++ b/test/jdl/jhipster/application-types.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/jhipster/binary-options.spec.js b/test/jdl/jhipster/binary-options.spec.js index ba57239d075d..9ea34a81da11 100644 --- a/test/jdl/jhipster/binary-options.spec.js +++ b/test/jdl/jhipster/binary-options.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/jhipster/database-types.spec.js b/test/jdl/jhipster/database-types.spec.js index fb45e2f9c8fe..576695adceac 100644 --- a/test/jdl/jhipster/database-types.spec.js +++ b/test/jdl/jhipster/database-types.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/jhipster/default-application-options.spec.js b/test/jdl/jhipster/default-application-options.spec.js index 7220b0c38f4f..57170e30c393 100644 --- a/test/jdl/jhipster/default-application-options.spec.js +++ b/test/jdl/jhipster/default-application-options.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/jhipster/deployment-options.spec.js b/test/jdl/jhipster/deployment-options.spec.js index 9a3465485dc4..7c7aa765e4a0 100644 --- a/test/jdl/jhipster/deployment-options.spec.js +++ b/test/jdl/jhipster/deployment-options.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/jhipster/entity-table-name-creator.spec.js b/test/jdl/jhipster/entity-table-name-creator.spec.js index f0942649a6bb..c959e92c36ef 100644 --- a/test/jdl/jhipster/entity-table-name-creator.spec.js +++ b/test/jdl/jhipster/entity-table-name-creator.spec.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/jhipster/field-types.spec.js b/test/jdl/jhipster/field-types.spec.js index af89606601aa..6d25dea7d52a 100644 --- a/test/jdl/jhipster/field-types.spec.js +++ b/test/jdl/jhipster/field-types.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/jhipster/json-entity.spec.js b/test/jdl/jhipster/json-entity.spec.js index 9e63bc0a7f6d..76a1634faefe 100644 --- a/test/jdl/jhipster/json-entity.spec.js +++ b/test/jdl/jhipster/json-entity.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/jhipster/relationship-options.spec.js b/test/jdl/jhipster/relationship-options.spec.js index f4661d4de309..33779e7b50c9 100644 --- a/test/jdl/jhipster/relationship-options.spec.js +++ b/test/jdl/jhipster/relationship-options.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/jhipster/relationship-types.spec.js b/test/jdl/jhipster/relationship-types.spec.js index b36826790725..26030ded14a3 100644 --- a/test/jdl/jhipster/relationship-types.spec.js +++ b/test/jdl/jhipster/relationship-types.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/jhipster/reserved-keywords.spec.js b/test/jdl/jhipster/reserved-keywords.spec.js index ecacd6fa022e..0536b6693df0 100644 --- a/test/jdl/jhipster/reserved-keywords.spec.js +++ b/test/jdl/jhipster/reserved-keywords.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/jhipster/unary-options.spec.js b/test/jdl/jhipster/unary-options.spec.js index e2c19afb78cb..bd43e1bd13f6 100644 --- a/test/jdl/jhipster/unary-options.spec.js +++ b/test/jdl/jhipster/unary-options.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/jhipster/validations.spec.js b/test/jdl/jhipster/validations.spec.js index 09e5f9579c93..56a7437dc5ea 100644 --- a/test/jdl/jhipster/validations.spec.js +++ b/test/jdl/jhipster/validations.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/linter/issues/entity-issue.spec.js b/test/jdl/linter/issues/entity-issue.spec.js index 760c9a47316d..dd060bf8df78 100644 --- a/test/jdl/linter/issues/entity-issue.spec.js +++ b/test/jdl/linter/issues/entity-issue.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/linter/issues/enum-issue.spec.js b/test/jdl/linter/issues/enum-issue.spec.js index e5d36c1a6493..b2d39be06fcb 100644 --- a/test/jdl/linter/issues/enum-issue.spec.js +++ b/test/jdl/linter/issues/enum-issue.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/linter/issues/field-issue.spec.js b/test/jdl/linter/issues/field-issue.spec.js index 8523ae3de93e..9e6e970f9515 100644 --- a/test/jdl/linter/issues/field-issue.spec.js +++ b/test/jdl/linter/issues/field-issue.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/linter/issues/issues.spec.js b/test/jdl/linter/issues/issues.spec.js index 96f38175ac86..154a493c4a17 100644 --- a/test/jdl/linter/issues/issues.spec.js +++ b/test/jdl/linter/issues/issues.spec.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/linter/issues/relationship-issue.spec.js b/test/jdl/linter/issues/relationship-issue.spec.js index 12d739e1fa63..3cdadfeff424 100644 --- a/test/jdl/linter/issues/relationship-issue.spec.js +++ b/test/jdl/linter/issues/relationship-issue.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/linter/jdl-linter.spec.js b/test/jdl/linter/jdl-linter.spec.js index 2e41f65d5d99..23f255b64b88 100644 --- a/test/jdl/linter/jdl-linter.spec.js +++ b/test/jdl/linter/jdl-linter.spec.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/linter/rule.spec.js b/test/jdl/linter/rule.spec.js index 32162dafce0d..791ce00641db 100644 --- a/test/jdl/linter/rule.spec.js +++ b/test/jdl/linter/rule.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/linter/rules.spec.js b/test/jdl/linter/rules.spec.js index 0f850f4161fd..17e4fbf5fcae 100644 --- a/test/jdl/linter/rules.spec.js +++ b/test/jdl/linter/rules.spec.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/abstract-jdl-option.spec.js b/test/jdl/models/abstract-jdl-option.spec.js index 025965e806cd..e89df6673351 100644 --- a/test/jdl/models/abstract-jdl-option.spec.js +++ b/test/jdl/models/abstract-jdl-option.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/jdl-application-configuration-factory.spec.js b/test/jdl/models/jdl-application-configuration-factory.spec.js index 3dae5f4d737a..292bc6302cf5 100644 --- a/test/jdl/models/jdl-application-configuration-factory.spec.js +++ b/test/jdl/models/jdl-application-configuration-factory.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/jdl-application-configuration.spec.js b/test/jdl/models/jdl-application-configuration.spec.js index 0136e664f43d..d30fb4f9d56b 100644 --- a/test/jdl/models/jdl-application-configuration.spec.js +++ b/test/jdl/models/jdl-application-configuration.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/jdl-application-entities.spec.js b/test/jdl/models/jdl-application-entities.spec.js index 0201bc8a6767..91704e031675 100644 --- a/test/jdl/models/jdl-application-entities.spec.js +++ b/test/jdl/models/jdl-application-entities.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/jdl-application-factory.spec.js b/test/jdl/models/jdl-application-factory.spec.js index 966a4d2c6425..521c3f2419f9 100644 --- a/test/jdl/models/jdl-application-factory.spec.js +++ b/test/jdl/models/jdl-application-factory.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/jdl-application.spec.js b/test/jdl/models/jdl-application.spec.js index d697d4567a28..0abea8b742cc 100644 --- a/test/jdl/models/jdl-application.spec.js +++ b/test/jdl/models/jdl-application.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/jdl-binary-option.spec.js b/test/jdl/models/jdl-binary-option.spec.js index ced8db5effeb..0d1d3e8718e3 100644 --- a/test/jdl/models/jdl-binary-option.spec.js +++ b/test/jdl/models/jdl-binary-option.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/jdl-deployment.spec.js b/test/jdl/models/jdl-deployment.spec.js index cfcdc30e8187..3ed38333686a 100644 --- a/test/jdl/models/jdl-deployment.spec.js +++ b/test/jdl/models/jdl-deployment.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/jdl-entity.spec.js b/test/jdl/models/jdl-entity.spec.js index ba213aae5c7d..b9aa7601bb40 100644 --- a/test/jdl/models/jdl-entity.spec.js +++ b/test/jdl/models/jdl-entity.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/jdl-enum-value.spec.js b/test/jdl/models/jdl-enum-value.spec.js index 79d2fae006b5..f6d4922cfe84 100644 --- a/test/jdl/models/jdl-enum-value.spec.js +++ b/test/jdl/models/jdl-enum-value.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/jdl-enum.spec.js b/test/jdl/models/jdl-enum.spec.js index 7fd15359a5b2..8d6089f21c16 100644 --- a/test/jdl/models/jdl-enum.spec.js +++ b/test/jdl/models/jdl-enum.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/jdl-enums.spec.js b/test/jdl/models/jdl-enums.spec.js index 8af2777083e7..04a73f2d560f 100644 --- a/test/jdl/models/jdl-enums.spec.js +++ b/test/jdl/models/jdl-enums.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/jdl-field.spec.js b/test/jdl/models/jdl-field.spec.js index aa507a603c54..2942b3fefa8d 100644 --- a/test/jdl/models/jdl-field.spec.js +++ b/test/jdl/models/jdl-field.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/jdl-object-merger.spec.js b/test/jdl/models/jdl-object-merger.spec.js index 0c399b918d68..d0412fc5cc4a 100644 --- a/test/jdl/models/jdl-object-merger.spec.js +++ b/test/jdl/models/jdl-object-merger.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/jdl-object.spec.js b/test/jdl/models/jdl-object.spec.js index 41676fb6a475..f7d9bb10230c 100644 --- a/test/jdl/models/jdl-object.spec.js +++ b/test/jdl/models/jdl-object.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/jdl-options.spec.js b/test/jdl/models/jdl-options.spec.js index d511fa477335..c28002a0b97d 100644 --- a/test/jdl/models/jdl-options.spec.js +++ b/test/jdl/models/jdl-options.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/jdl-relationship.spec.js b/test/jdl/models/jdl-relationship.spec.js index ee89593c0700..04f1874bd432 100644 --- a/test/jdl/models/jdl-relationship.spec.js +++ b/test/jdl/models/jdl-relationship.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/jdl-relationships.spec.js b/test/jdl/models/jdl-relationships.spec.js index 18ce076d34f8..952dce1c12c9 100644 --- a/test/jdl/models/jdl-relationships.spec.js +++ b/test/jdl/models/jdl-relationships.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/jdl-unary-option.spec.js b/test/jdl/models/jdl-unary-option.spec.js index b048545ad48d..632937a21bd4 100644 --- a/test/jdl/models/jdl-unary-option.spec.js +++ b/test/jdl/models/jdl-unary-option.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/models/jdl-validation.spec.js b/test/jdl/models/jdl-validation.spec.js index 33201442936f..86fa362a3148 100644 --- a/test/jdl/models/jdl-validation.spec.js +++ b/test/jdl/models/jdl-validation.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/parsing/lexer/token-creator.spec.js b/test/jdl/parsing/lexer/token-creator.spec.js index ebe16b549e65..8c00a2eac212 100644 --- a/test/jdl/parsing/lexer/token-creator.spec.js +++ b/test/jdl/parsing/lexer/token-creator.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/readers/file-reader.spec.js b/test/jdl/readers/file-reader.spec.js index 45f954a687e4..8e5d903b99d8 100644 --- a/test/jdl/readers/file-reader.spec.js +++ b/test/jdl/readers/file-reader.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/readers/jdl-reader.spec.js b/test/jdl/readers/jdl-reader.spec.js index 9c06e0a684b2..dac667791dde 100644 --- a/test/jdl/readers/jdl-reader.spec.js +++ b/test/jdl/readers/jdl-reader.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/readers/json-file-reader.spec.js b/test/jdl/readers/json-file-reader.spec.js index 9b6c112f74fa..e7de2ac8a8ec 100644 --- a/test/jdl/readers/json-file-reader.spec.js +++ b/test/jdl/readers/json-file-reader.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/readers/json-reader.spec.js b/test/jdl/readers/json-reader.spec.js index 712cedbfba8a..70b3c9de9098 100644 --- a/test/jdl/readers/json-reader.spec.js +++ b/test/jdl/readers/json-reader.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/utils/array-utils.spec.js b/test/jdl/utils/array-utils.spec.js index 4fc36da0c49c..fe15d029d71c 100644 --- a/test/jdl/utils/array-utils.spec.js +++ b/test/jdl/utils/array-utils.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/utils/files-utils.spec.js b/test/jdl/utils/files-utils.spec.js index b8caeb922dbd..5e027cd86ade 100644 --- a/test/jdl/utils/files-utils.spec.js +++ b/test/jdl/utils/files-utils.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/utils/format-utils.spec.js b/test/jdl/utils/format-utils.spec.js index 3839c48aed1a..3c7f88c61fdd 100644 --- a/test/jdl/utils/format-utils.spec.js +++ b/test/jdl/utils/format-utils.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/utils/object-utils.spec.js b/test/jdl/utils/object-utils.spec.js index 787f450d5fbf..3c6b4a230d39 100644 --- a/test/jdl/utils/object-utils.spec.js +++ b/test/jdl/utils/object-utils.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/utils/set-utils.spec.js b/test/jdl/utils/set-utils.spec.js index e5a0788d146c..4bf08a71ef24 100644 --- a/test/jdl/utils/set-utils.spec.js +++ b/test/jdl/utils/set-utils.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/utils/string_utils.spec.js b/test/jdl/utils/string_utils.spec.js index d9a8f443135a..6f9b88e818a8 100644 --- a/test/jdl/utils/string_utils.spec.js +++ b/test/jdl/utils/string_utils.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/validators/application-validator.spec.js b/test/jdl/validators/application-validator.spec.js index fc148489805a..56f0bd28a0d1 100644 --- a/test/jdl/validators/application-validator.spec.js +++ b/test/jdl/validators/application-validator.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/validators/binary-option-validator.spec.js b/test/jdl/validators/binary-option-validator.spec.js index 18a878cab720..2644bb5a6085 100644 --- a/test/jdl/validators/binary-option-validator.spec.js +++ b/test/jdl/validators/binary-option-validator.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/validators/deployment-validator.spec.js b/test/jdl/validators/deployment-validator.spec.js index e1d197d7f793..0a828d1ef6bc 100644 --- a/test/jdl/validators/deployment-validator.spec.js +++ b/test/jdl/validators/deployment-validator.spec.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/validators/entity-validator.spec.js b/test/jdl/validators/entity-validator.spec.js index 0f775eb8ebde..6b9fc5734c95 100644 --- a/test/jdl/validators/entity-validator.spec.js +++ b/test/jdl/validators/entity-validator.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/validators/enum-validator.spec.js b/test/jdl/validators/enum-validator.spec.js index 2ff7a278ac84..c4df62b8dad9 100644 --- a/test/jdl/validators/enum-validator.spec.js +++ b/test/jdl/validators/enum-validator.spec.js @@ -1,13 +1,14 @@ -/** Copyright 2013-2020 the original author or authors from the JHipster project. +/** + * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/validators/field-validator.spec.js b/test/jdl/validators/field-validator.spec.js index 805f9bea9dd6..b1f41e2acd5c 100644 --- a/test/jdl/validators/field-validator.spec.js +++ b/test/jdl/validators/field-validator.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/validators/jdl-with-application-validator.spec.js b/test/jdl/validators/jdl-with-application-validator.spec.js index 65345984c384..b232102fc2c0 100644 --- a/test/jdl/validators/jdl-with-application-validator.spec.js +++ b/test/jdl/validators/jdl-with-application-validator.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/validators/jdl-without-application-validator.spec.js b/test/jdl/validators/jdl-without-application-validator.spec.js index 53566d3e4ee4..e8fc87abcec3 100644 --- a/test/jdl/validators/jdl-without-application-validator.spec.js +++ b/test/jdl/validators/jdl-without-application-validator.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/validators/relationship-validator.spec.js b/test/jdl/validators/relationship-validator.spec.js index a581accff6cb..e387dd98e372 100644 --- a/test/jdl/validators/relationship-validator.spec.js +++ b/test/jdl/validators/relationship-validator.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/validators/unary-option-validator.spec.js b/test/jdl/validators/unary-option-validator.spec.js index 079ea488a9e9..7c6501b220a1 100644 --- a/test/jdl/validators/unary-option-validator.spec.js +++ b/test/jdl/validators/unary-option-validator.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/jdl/validators/validation-validator.spec.js b/test/jdl/validators/validation-validator.spec.js index e5e538d6a9d6..8c4021899f7b 100644 --- a/test/jdl/validators/validation-validator.spec.js +++ b/test/jdl/validators/validation-validator.spec.js @@ -1,14 +1,14 @@ /** * Copyright 2013-2020 the original author or authors from the JHipster project. * - * This file is part of the JHipster project, see http://www.jhipster.tech/ + * 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"); * 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/test/templates/blueprint-cli-shared/cli/sharedOptions.js b/test/templates/blueprint-cli-shared/cli/sharedOptions.js index 548c3c51102e..8e5527037f7e 100644 --- a/test/templates/blueprint-cli-shared/cli/sharedOptions.js +++ b/test/templates/blueprint-cli-shared/cli/sharedOptions.js @@ -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/test/templates/blueprint-cli-shared/generators/bar/index.js b/test/templates/blueprint-cli-shared/generators/bar/index.js index 1af9022e1521..814823070bd1 100644 --- a/test/templates/blueprint-cli-shared/generators/bar/index.js +++ b/test/templates/blueprint-cli-shared/generators/bar/index.js @@ -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/test/templates/blueprint-cli-shared/generators/foo/index.js b/test/templates/blueprint-cli-shared/generators/foo/index.js index ca808cbf3336..5a5e2b54ff83 100644 --- a/test/templates/blueprint-cli-shared/generators/foo/index.js +++ b/test/templates/blueprint-cli-shared/generators/foo/index.js @@ -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/test/templates/ngx-blueprint/HelloKotlin.kt.ejs b/test/templates/ngx-blueprint/HelloKotlin.kt.ejs index 642cfab6b82d..86a6a8d10769 100644 --- a/test/templates/ngx-blueprint/HelloKotlin.kt.ejs +++ b/test/templates/ngx-blueprint/HelloKotlin.kt.ejs @@ -1,12 +1,16 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see http://www.jhipster.tech/ + + 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 - Unless required by applicable law or agreed to in writing, software + + 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, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and diff --git a/test/templates/ngx-blueprint/HelloVue.html.ejs b/test/templates/ngx-blueprint/HelloVue.html.ejs index 57081bf19d18..e14d87d58e41 100644 --- a/test/templates/ngx-blueprint/HelloVue.html.ejs +++ b/test/templates/ngx-blueprint/HelloVue.html.ejs @@ -1,12 +1,16 @@ <%# Copyright 2013-2020 the original author or authors from the JHipster project. - This file is part of the JHipster project, see http://www.jhipster.tech/ + + 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 - Unless required by applicable law or agreed to in writing, software + + 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, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and diff --git a/test/templates/ngx-blueprint/custom-i18n.json.ejs b/test/templates/ngx-blueprint/custom-i18n.json.ejs index 2e114455c9bd..ae6794a4d90d 100644 --- a/test/templates/ngx-blueprint/custom-i18n.json.ejs +++ b/test/templates/ngx-blueprint/custom-i18n.json.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/test/utils-entity.spec.js b/test/utils-entity.spec.js index 545e95e3a621..4b05d298806b 100644 --- a/test/utils-entity.spec.js +++ b/test/utils-entity.spec.js @@ -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/test/utils-field.spec.js b/test/utils-field.spec.js index 053321baa199..95956c25fdde 100644 --- a/test/utils-field.spec.js +++ b/test/utils-field.spec.js @@ -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/utils/blueprint.js b/utils/blueprint.js index 67802c54c1f7..1c24a53b4747 100644 --- a/utils/blueprint.js +++ b/utils/blueprint.js @@ -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/utils/db.js b/utils/db.js index e927fb2f5012..57b562d6bc83 100644 --- a/utils/db.js +++ b/utils/db.js @@ -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/utils/entity.js b/utils/entity.js index 6b8abcbd7b0b..8440db3c9b91 100644 --- a/utils/entity.js +++ b/utils/entity.js @@ -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/utils/faker.js b/utils/faker.js index c44b0627406f..d89449415a8e 100644 --- a/utils/faker.js +++ b/utils/faker.js @@ -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/utils/field.js b/utils/field.js index dc29bb90e33c..f42f68d07576 100644 --- a/utils/field.js +++ b/utils/field.js @@ -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/utils/index.js b/utils/index.js index c086b05755e4..a05ea6e06449 100644 --- a/utils/index.js +++ b/utils/index.js @@ -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/utils/language.js b/utils/language.js index 2cde501acf28..eb3de39f7a45 100644 --- a/utils/language.js +++ b/utils/language.js @@ -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/utils/liquibase.js b/utils/liquibase.js index 72498e0e7159..3e50513808b5 100644 --- a/utils/liquibase.js +++ b/utils/liquibase.js @@ -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/utils/relationship.js b/utils/relationship.js index 5a61aec99f10..48633d6ac07b 100644 --- a/utils/relationship.js +++ b/utils/relationship.js @@ -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, From 674e1eef2f07143d5f1fe51a33b8168c914c1d57 Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Fri, 4 Dec 2020 11:00:28 +0200 Subject: [PATCH 0083/1179] [angular] Simplify UserRouteAccessService --- .../webapp/app/core/auth/user-route-access.service.ts.ejs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/generators/client/templates/angular/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs b/generators/client/templates/angular/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs index b56a08693f97..ccfceaff937f 100644 --- a/generators/client/templates/angular/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs +++ b/generators/client/templates/angular/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs @@ -44,11 +44,7 @@ export class UserRouteAccessService implements CanActivate { if (account) { const authorities = route.data['authorities']; - if (!authorities || authorities.length === 0) { - return true; - } - - if (this.accountService.hasAnyAuthority(authorities)) { + if (!authorities || authorities.length === 0 || this.accountService.hasAnyAuthority(authorities)) { return true; } From 0edf327c93cc1c7f059fc20218cbc05a875bc707 Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Fri, 4 Dec 2020 13:03:25 +0200 Subject: [PATCH 0084/1179] Improve page title logic for Angular client --- .../needle-api/needle-client-angular.js | 19 ++++++++++++------- generators/entity-client/files.js | 5 ++++- .../entity-management-routing.module.ts.ejs | 14 ++------------ generators/generator-base.js | 14 ++++++++------ test/needle-api/needle-client-angular.spec.js | 12 ++++++++---- 5 files changed, 34 insertions(+), 30 deletions(-) diff --git a/generators/client/needle-api/needle-client-angular.js b/generators/client/needle-api/needle-client-angular.js index 63ebb7945caa..75d104a4f9ec 100644 --- a/generators/client/needle-api/needle-client-angular.js +++ b/generators/client/needle-api/needle-client-angular.js @@ -200,23 +200,28 @@ module.exports = class extends needleClientBase { this.addIcon(iconName); } - _addRoute(route, modulePath, moduleName, needleName, filePath) { + _addRoute(route, modulePath, moduleName, needleName, filePath, pageTitle) { const isRouteAlreadyAdded = jhipsterUtils.checkStringInFile(filePath, `path: '${route}'`, this.generator); if (isRouteAlreadyAdded) { return; } const errorMessage = `${chalk.yellow('Route ') + route + chalk.yellow(` not added to ${filePath}.\n`)}`; + let pageTitleTemplate = ''; + if (pageTitle) { + pageTitleTemplate = ` + | data: { pageTitle: '${pageTitle}' },`; + } const routingEntry = this.generator.stripMargin( `{ - | path: '${route}', - | loadChildren: () => import('${modulePath}').then(m => m.${moduleName}) + | path: '${route}',${pageTitleTemplate} + | loadChildren: () => import('${modulePath}').then(m => m.${moduleName}), | },` ); const rewriteFileModel = this.generateFileModel(filePath, needleName, routingEntry); this.addBlockContentToFile(rewriteFileModel, errorMessage); } - addEntityToModule(entityInstance, entityClass, entityAngularName, entityFolderName, entityFileName, entityUrl, microServiceName) { + addEntityToModule(entityAngularName, entityFolderName, entityFileName, entityUrl, microServiceName, pageTitle) { const entityModulePath = `${this.CLIENT_MAIN_SRC_DIR}app/entities/entity-routing.module.ts`; try { const isSpecificEntityAlreadyGenerated = jhipsterUtils.checkStringInFile( @@ -231,15 +236,15 @@ module.exports = class extends needleClientBase { ? `${this.generator.upperFirstCamelCase(microServiceName)}${entityAngularName}RoutingModule` : `${entityAngularName}RoutingModule`; - this._addRoute(entityUrl, modulePath, moduleName, 'jhipster-needle-add-entity-route', entityModulePath); + this._addRoute(entityUrl, modulePath, moduleName, 'jhipster-needle-add-entity-route', entityModulePath, pageTitle); } } catch (e) { this.generator.debug('Error:', e); } } - addAdminRoute(route, modulePath, moduleName) { + addAdminRoute(route, modulePath, moduleName, pageTitle) { const adminModulePath = `${this.CLIENT_MAIN_SRC_DIR}app/admin/admin-routing.module.ts`; - this._addRoute(route, modulePath, moduleName, 'jhipster-needle-add-admin-route', adminModulePath); + this._addRoute(route, modulePath, moduleName, 'jhipster-needle-add-admin-route', adminModulePath, pageTitle); } }; diff --git a/generators/entity-client/files.js b/generators/entity-client/files.js index 5008de380545..9ee2312e2303 100644 --- a/generators/entity-client/files.js +++ b/generators/entity-client/files.js @@ -455,12 +455,14 @@ function writeFiles() { let clientMainSrcDir; let templatesDir; let microserviceName = this.microserviceName; + let pageTitle; if (this.clientFramework === ANGULAR) { files = angularFiles; clientMainSrcDir = ANGULAR_DIR; templatesDir = CLIENT_NG2_TEMPLATES_DIR; microserviceName = this.microserviceName; + pageTitle = this.enableTranslation ? `${this.i18nKeyPrefix}.home.title` : this.entityClassPlural; } else if (this.clientFramework === REACT) { files = reactFiles; clientMainSrcDir = REACT_DIR; @@ -497,7 +499,8 @@ function writeFiles() { this.entityUrl, this.clientFramework, microserviceName, - this.readOnly + this.readOnly, + pageTitle ); this.addEntityToMenu( this.entityStateName, diff --git a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs index cd35e9582704..908daa4af7a9 100644 --- a/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs +++ b/generators/entity-client/templates/angular/src/main/webapp/app/entities/entity-management-routing.module.ts.ejs @@ -33,12 +33,11 @@ const <%= entityInstance %>Route: Routes = [ { path: '', component: <%= entityAngularName %>Component, + <%_ if (pagination === 'pagination') { _%> data: { - <%_ if (pagination === 'pagination') { _%> defaultSort: 'id,asc', - <%_ } _%> - pageTitle: <% if (enableTranslation) { %>'<%= i18nKeyPrefix %>.home.title'<% } else { %>'<%= entityClassPlural %>'<% } %> }, + <%_ } _%> canActivate: [UserRouteAccessService] }, { @@ -47,9 +46,6 @@ const <%= entityInstance %>Route: Routes = [ resolve: { <%= entityInstance %>: <%= entityAngularName %>RoutingResolveService }, - data: { - pageTitle: <% if (enableTranslation) { %>'<%= i18nKeyPrefix %>.home.title'<% } else { %>'<%= entityClassPlural %>'<% } %> - }, canActivate: [UserRouteAccessService] }, <%_ if (!readOnly) { _%> @@ -59,9 +55,6 @@ const <%= entityInstance %>Route: Routes = [ resolve: { <%= entityInstance %>: <%= entityAngularName %>RoutingResolveService }, - data: { - pageTitle: <% if (enableTranslation) { %>'<%= i18nKeyPrefix %>.home.title'<% } else { %>'<%= entityClassPlural %>'<% } %> - }, canActivate: [UserRouteAccessService] }, { @@ -70,9 +63,6 @@ const <%= entityInstance %>Route: Routes = [ resolve: { <%= entityInstance %>: <%= entityAngularName %>RoutingResolveService }, - data: { - pageTitle: <% if (enableTranslation) { %>'<%= i18nKeyPrefix %>.home.title'<% } else { %>'<%= entityClassPlural %>'<% } %> - }, canActivate: [UserRouteAccessService] }, <%_ } _%> diff --git a/generators/generator-base.js b/generators/generator-base.js index b08122301fa0..eeb6a2aaddf1 100644 --- a/generators/generator-base.js +++ b/generators/generator-base.js @@ -429,6 +429,7 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase { * @param {string} clientFramework - The name of the client framework * @param {string} microServiceName - Microservice Name * @param {boolean} readOnly - If the entity is read-only or not + * @param {string} pageTitle - The translation key or the text for the page title in the browser */ addEntityToModule( entityInstance, @@ -439,17 +440,17 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase { entityUrl, clientFramework, microServiceName, - readOnly + readOnly, + pageTitle ) { if (clientFramework === ANGULAR) { this.needleApi.clientAngular.addEntityToModule( - entityInstance, - entityClass, entityName, entityFolderName, entityFileName, entityUrl, - microServiceName + microServiceName, + pageTitle ); } else if (clientFramework === REACT) { this.needleApi.clientReact.addEntityToModule(entityInstance, entityClass, entityName, entityFolderName, entityFileName); @@ -488,9 +489,10 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase { * @param {string} route - The route for the module. For example 'entity-audit'. * @param {string} modulePath - The path to the module file. For example './entity-audit/entity-audit.module'. * @param {string} moduleName - The name of the module. For example 'EntityAuditModule'. + * @param {string} pageTitle - The translation key or the text for the page title in the browser. For example 'entityAudit.home.title' or 'Entity audit'. */ - addAdminRoute(route, modulePath, moduleName) { - this.needleApi.clientAngular.addAdminRoute(route, modulePath, moduleName); + addAdminRoute(route, modulePath, moduleName, pageTitle) { + this.needleApi.clientAngular.addAdminRoute(route, modulePath, moduleName, pageTitle); } /** diff --git a/test/needle-api/needle-client-angular.spec.js b/test/needle-api/needle-client-angular.spec.js index ff8261e417a5..b1ce53090483 100644 --- a/test/needle-api/needle-client-angular.spec.js +++ b/test/needle-api/needle-client-angular.spec.js @@ -56,11 +56,13 @@ const mockBlueprintSubGen = class extends ClientGenerator { 'entityFileName', 'entityUrl', ANGULAR, - 'microServiceName' + 'microServiceName', + false, + 'entity.home.title' ); this.addAdminToModule('appName', 'adminAngularName', 'adminFolderName', 'adminFileName', true, ANGULAR); this.addAngularModule('appName', 'angularName', 'folderName', 'fileName', true, ANGULAR); - this.addAdminRoute('entity-audit', './entity-audit/entity-audit.module', 'EntityAuditModule'); + this.addAdminRoute('entity-audit', './entity-audit/entity-audit.module', 'EntityAuditModule', 'entityAudit.home.title'); }, }; return { ...phaseFromJHipster, ...customPhaseSteps }; @@ -176,7 +178,8 @@ describe('needle API Angular: JHipster client generator with blueprint', () => { `${CLIENT_MAIN_SRC_DIR}app/entities/entity-routing.module.ts`, ' {\n' + " path: 'entityUrl',\n" + - " loadChildren: () => import('./entityFolderName/entityFileName-routing.module').then(m => m.MicroServiceNameentityNameRoutingModule)\n" + + " data: { pageTitle: 'entity.home.title' },\n" + + " loadChildren: () => import('./entityFolderName/entityFileName-routing.module').then(m => m.MicroServiceNameentityNameRoutingModule),\n" + ' }' ); }); @@ -195,7 +198,8 @@ describe('needle API Angular: JHipster client generator with blueprint', () => { ' },\n' + ' {\n' + " path: 'entity-audit',\n" + - " loadChildren: () => import('./entity-audit/entity-audit.module').then(m => m.EntityAuditModule)\n" + + " data: { pageTitle: 'entityAudit.home.title' },\n" + + " loadChildren: () => import('./entity-audit/entity-audit.module').then(m => m.EntityAuditModule),\n" + ' },' ); }); From 4624be89357308a437b72a307b5d56440222466d Mon Sep 17 00:00:00 2001 From: Kaido Hallik Date: Fri, 4 Dec 2020 21:02:19 +0200 Subject: [PATCH 0085/1179] Simplify addEntityToModule and document better addAdminRoute.pageTitle --- generators/entity-client/files.js | 17 +---------------- generators/generator-base.js | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/generators/entity-client/files.js b/generators/entity-client/files.js index 9ee2312e2303..66d4f87f2140 100644 --- a/generators/entity-client/files.js +++ b/generators/entity-client/files.js @@ -454,15 +454,11 @@ function writeFiles() { let files; let clientMainSrcDir; let templatesDir; - let microserviceName = this.microserviceName; - let pageTitle; if (this.clientFramework === ANGULAR) { files = angularFiles; clientMainSrcDir = ANGULAR_DIR; templatesDir = CLIENT_NG2_TEMPLATES_DIR; - microserviceName = this.microserviceName; - pageTitle = this.enableTranslation ? `${this.i18nKeyPrefix}.home.title` : this.entityClassPlural; } else if (this.clientFramework === REACT) { files = reactFiles; clientMainSrcDir = REACT_DIR; @@ -490,18 +486,7 @@ function writeFiles() { addEnumerationFiles(this, clientMainSrcDir); if (!this.embedded) { - this.addEntityToModule( - this.entityInstance, - this.entityClass, - this.entityAngularName, - this.entityFolderName, - this.entityFileName, - this.entityUrl, - this.clientFramework, - microserviceName, - this.readOnly, - pageTitle - ); + this.addEntityToModule(); this.addEntityToMenu( this.entityStateName, this.enableTranslation, diff --git a/generators/generator-base.js b/generators/generator-base.js index eeb6a2aaddf1..b60f34037d2c 100644 --- a/generators/generator-base.js +++ b/generators/generator-base.js @@ -432,16 +432,16 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase { * @param {string} pageTitle - The translation key or the text for the page title in the browser */ addEntityToModule( - entityInstance, - entityClass, - entityName, - entityFolderName, - entityFileName, - entityUrl, - clientFramework, - microServiceName, - readOnly, - pageTitle + entityInstance = this.entityInstance, + entityClass = this.entityClass, + entityName = this.entityAngularName, + entityFolderName = this.entityFolderName, + entityFileName = this.entityFileName, + entityUrl = this.entityUrl, + clientFramework = this.clientFramework, + microServiceName = this.microServiceName, + readOnly = this.readOnly, + pageTitle = this.enableTranslation ? `${this.i18nKeyPrefix}.home.title` : this.entityClassPlural ) { if (clientFramework === ANGULAR) { this.needleApi.clientAngular.addEntityToModule( @@ -489,7 +489,9 @@ module.exports = class JHipsterBaseGenerator extends PrivateBase { * @param {string} route - The route for the module. For example 'entity-audit'. * @param {string} modulePath - The path to the module file. For example './entity-audit/entity-audit.module'. * @param {string} moduleName - The name of the module. For example 'EntityAuditModule'. - * @param {string} pageTitle - The translation key or the text for the page title in the browser. For example 'entityAudit.home.title' or 'Entity audit'. + * @param {string} pageTitle - The translation key if i18n is enabled or the text if i18n is disabled for the page title in the browser. + * For example 'entityAudit.home.title' for i18n enabled or 'Entity audit' for i18n disabled. + * If undefined then application global page title is used in the browser title bar. */ addAdminRoute(route, modulePath, moduleName, pageTitle) { this.needleApi.clientAngular.addAdminRoute(route, modulePath, moduleName, pageTitle); From 0906376cf4edb93af359cbc613caaf2159b73071 Mon Sep 17 00:00:00 2001 From: qmonmert Date: Fri, 4 Dec 2020 19:04:41 +0100 Subject: [PATCH 0086/1179] [react] Fix function mapIdList when param is undefined --- .../src/main/webapp/app/shared/util/entity-utils.ts.ejs | 7 ++++++- .../spec/app/shared/util/entity-utils.spec.ts.ejs | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/generators/client/templates/react/src/main/webapp/app/shared/util/entity-utils.ts.ejs b/generators/client/templates/react/src/main/webapp/app/shared/util/entity-utils.ts.ejs index 2958031b49af..0a09dc9bca26 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/util/entity-utils.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/util/entity-utils.ts.ejs @@ -38,7 +38,12 @@ export const cleanEntity = entity => { * @param idList Elements to map. * @returns The list of objects with mapped ids. */ - export const mapIdList = (idList: ReadonlyArray) => idList.filter((entityId: any) => entityId !== '').map((entityId: any) => ({ id: entityId })); +export const mapIdList = (idList: ReadonlyArray) => { + if (idList) { + return idList.filter((entityId: any) => entityId !== '').map((entityId: any) => ({ id: entityId })); + } + return []; +}; export const overridePaginationStateWithQueryParams = (paginationBaseState: IPaginationBaseState , locationSearch: string) => { const params = new URLSearchParams(locationSearch); diff --git a/generators/client/templates/react/src/test/javascript/spec/app/shared/util/entity-utils.spec.ts.ejs b/generators/client/templates/react/src/test/javascript/spec/app/shared/util/entity-utils.spec.ts.ejs index 1dfdd6eb20e3..3ac0c6b79fb0 100644 --- a/generators/client/templates/react/src/test/javascript/spec/app/shared/util/entity-utils.spec.ts.ejs +++ b/generators/client/templates/react/src/test/javascript/spec/app/shared/util/entity-utils.spec.ts.ejs @@ -72,5 +72,11 @@ describe('Entity utils', () => { expect(mapIdList(ids)).toEqual([]); }); + + it('should return an empty array when args is undefined', () => { + const ids = undefined; + + expect(mapIdList(ids)).toEqual([]); + }); }); }); From 1678d26a12b517ef4557616910d5fd884342ef64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Tamisier?= Date: Sat, 5 Dec 2020 15:13:20 +0100 Subject: [PATCH 0087/1179] fix: add missing mapstruct version property --- generators/server/templates/pom.xml.ejs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/generators/server/templates/pom.xml.ejs b/generators/server/templates/pom.xml.ejs index 2d7ee70119bb..9c4155db9073 100644 --- a/generators/server/templates/pom.xml.ejs +++ b/generators/server/templates/pom.xml.ejs @@ -584,10 +584,12 @@ org.mapstruct mapstruct + ${mapstruct.version} org.mapstruct mapstruct-processor + ${mapstruct.version} provided @@ -1779,6 +1781,7 @@ org.mapstruct mapstruct-processor + ${mapstruct.version} <%_ if (databaseType === 'sql') { _%> From c9166b18cd1a24cdc98ff50da529fa2acc80c3a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Tamisier?= Date: Sat, 5 Dec 2020 18:57:30 +0100 Subject: [PATCH 0088/1179] Revert "[react] Fix function mapIdList when param is undefined" This reverts commit 0906376c --- .../src/main/webapp/app/shared/util/entity-utils.ts.ejs | 7 +------ .../spec/app/shared/util/entity-utils.spec.ts.ejs | 6 ------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/generators/client/templates/react/src/main/webapp/app/shared/util/entity-utils.ts.ejs b/generators/client/templates/react/src/main/webapp/app/shared/util/entity-utils.ts.ejs index 0a09dc9bca26..2958031b49af 100644 --- a/generators/client/templates/react/src/main/webapp/app/shared/util/entity-utils.ts.ejs +++ b/generators/client/templates/react/src/main/webapp/app/shared/util/entity-utils.ts.ejs @@ -38,12 +38,7 @@ export const cleanEntity = entity => { * @param idList Elements to map. * @returns The list of objects with mapped ids. */ -export const mapIdList = (idList: ReadonlyArray) => { - if (idList) { - return idList.filter((entityId: any) => entityId !== '').map((entityId: any) => ({ id: entityId })); - } - return []; -}; + export const mapIdList = (idList: ReadonlyArray) => idList.filter((entityId: any) => entityId !== '').map((entityId: any) => ({ id: entityId })); export const overridePaginationStateWithQueryParams = (paginationBaseState: IPaginationBaseState , locationSearch: string) => { const params = new URLSearchParams(locationSearch); diff --git a/generators/client/templates/react/src/test/javascript/spec/app/shared/util/entity-utils.spec.ts.ejs b/generators/client/templates/react/src/test/javascript/spec/app/shared/util/entity-utils.spec.ts.ejs index 3ac0c6b79fb0..1dfdd6eb20e3 100644 --- a/generators/client/templates/react/src/test/javascript/spec/app/shared/util/entity-utils.spec.ts.ejs +++ b/generators/client/templates/react/src/test/javascript/spec/app/shared/util/entity-utils.spec.ts.ejs @@ -72,11 +72,5 @@ describe('Entity utils', () => { expect(mapIdList(ids)).toEqual([]); }); - - it('should return an empty array when args is undefined', () => { - const ids = undefined; - - expect(mapIdList(ids)).toEqual([]); - }); }); }); From 43eaee677eea786b2ee1c6733da5c8db7ec36b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Tamisier?= Date: Sat, 5 Dec 2020 18:59:41 +0100 Subject: [PATCH 0089/1179] fix: do not update AvInput value once it is set (after state reset) --- .../react/src/main/webapp/app/entities/entity-update.tsx.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs index 1bb4438e9a02..67d51f136351 100644 --- a/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs +++ b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs @@ -499,7 +499,7 @@ export const <%= entityReactName %>Update = (props: I<%= entityReactName %>Updat multiple className="form-control" name="<%= relationshipFieldNamePlural %>" - value={<%= entityInstance %>Entity.<%= relationshipFieldNamePlural %> && <%= entityInstance %>Entity.<%= relationshipFieldNamePlural %>.map(e => e.id)} + value={!isNew && <%= entityInstance %>Entity.<%= relationshipFieldNamePlural %> && <%= entityInstance %>Entity.<%= relationshipFieldNamePlural %>.map(e => e.id)} >