Skip to content
  • Nikolai Voitsehhovski's avatar
    94789a8a
    Pull request #82: NT-497 JHipster versiooniuuendamine · 94789a8a
    Nikolai Voitsehhovski authored
    
    
    Merge in CONSENT/servicedeclaration from feature/NT-497 to develop
    
    Squashed commit of the following:
    
    commit 9dc137c7347450884ec449335ca4fff9753c0b4c
    Author: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee>
    Date:   Thu Nov 3 14:09:30 2022 +0200
    
        NT-497 JHipster versiooniuuendamine #fix
    Signed-off-by: default avatarNikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee>
    
    commit af3f4b112d059f8b97d9ca054f67574ddbead10b
    Merge: 60afb71 98287a4
    Author: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee>
    Date:   Thu Nov 3 10:23:49 2022 +0200
    
        Merge branch 'jhipster_upgrade' into feature/NT-497
    
        # Conflicts:
        #	.yo-rc.json
        #	README.md
        #	build.gradle
        #	checkstyle.xml
        #	gradle.properties
        #	gradle/wrapper/gradle-wrapper.properties
        #	gradlew
        #	settings.gradle
        #	sonar-project.properties
        #	src/main/java/ee/ria/consentmanagement/ServiceDeclarationApp.java
        #	src/main/java/ee/ria/consentmanagement/aop/logging/LoggingAspect.java
        #	src/main/java/ee/ria/consentmanagement/client/UserFeignClientInterceptor.java
        #	src/main/java/ee/ria/consentmanagement/config/ApplicationProperties.java
        #	src/main/java/ee/ria/consentmanagement/config/AsyncConfiguration.java
        #	src/main/java/ee/ria/consentmanagement/config/Constants.java
        #	src/main/java/ee/ria/consentmanagement/config/DatabaseConfiguration.java
        #	src/main/java/ee/ria/consentmanagement/config/LiquibaseConfiguration.java
        #	src/main/java/ee/ria/consentmanagement/config/LocaleConfiguration.java
        #	src/main/java/ee/ria/consentmanagement/config/LoggingAspectConfiguration.java
        #	src/main/java/ee/ria/consentmanagement/config/LoggingConfiguration.java
        #	src/main/java/ee/ria/consentmanagement/config/OpenApiConfiguration.java
        #	src/main/java/ee/ria/consentmanagement/config/SecurityConfiguration.java
        #	src/main/java/ee/ria/consentmanagement/config/WebConfigurer.java
        #	src/main/java/ee/ria/consentmanagement/config/audit/AuditEventConverter.java
        #	src/main/java/ee/ria/consentmanagement/domain/AbstractAuditingEntity.java
        #	src/main/java/ee/ria/consentmanagement/domain/PersistentAuditEvent.java
        #	src/main/java/ee/ria/consentmanagement/security/AuthoritiesConstants.java
        #	src/main/java/ee/ria/consentmanagement/security/SecurityUtils.java
        #	src/main/java/ee/ria/consentmanagement/security/SpringSecurityAuditorAware.java
        #	src/main/java/ee/ria/consentmanagement/security/jwt/JwtFilter.java
        #	src/main/java/ee/ria/consentmanagement/security/jwt/TokenProvider.java
        #	src/main/java/ee/ria/consentmanagement/web/rest/errors/BadRequestAlertException.java
        #	src/main/java/ee/ria/consentmanagement/web/rest/errors/ErrorConstants.java
        #	src/main/java/ee/ria/consentmanagement/web/rest/errors/ExceptionTranslator.java
        #	src/main/java/ee/ria/consentmanagement/web/rest/errors/FieldErrorVM.java
        #	src/main/resources/config/application.yml
        #	src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
        #	src/main/resources/config/liquibase/master.xml
        #	src/main/resources/logback-spring.xml
        #	src/main/resources/static/index.html
        #	src/main/resources/templates/error.html
        #	src/test/java/ee/ria/consentmanagement/ArchTest.java
        #	src/test/java/ee/ria/consentmanagement/config/WebConfigurerTest.java
        #	src/test/java/ee/ria/consentmanagement/config/timezone/HibernateTimeZoneIT.java
        #	src/test/java/ee/ria/consentmanagement/repository/timezone/DateTimeWrapper.java
        #	src/test/java/ee/ria/consentmanagement/repository/timezone/DateTimeWrapperRepository.java
        #	src/test/java/ee/ria/consentmanagement/security/SecurityUtilsUnitTest.java
        #	src/test/java/ee/ria/consentmanagement/security/jwt/JwtFilterTest.java
        #	src/test/java/ee/ria/consentmanagement/security/jwt/TokenProviderTest.java
        #	src/test/java/ee/ria/consentmanagement/web/rest/TestUtil.java
        #	src/test/java/ee/ria/consentmanagement/web/rest/errors/ExceptionTranslatorIT.java
        #	src/test/java/ee/ria/consentmanagement/web/rest/errors/ExceptionTranslatorTestController.java
        #	src/test/resources/config/application-testcontainers.yml
        #	src/test/resources/config/application.yml
        #	src/test/resources/logback.xml
    
    commit 98287a4e0391978d5b1c95c5ab85f92ddb348adc
    Author: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee>
    Date:   Tue Oct 18 16:53:09 2022 +0300
    
        Generated with JHipster 7.9.3
    
    commit 60afb71234779937950bfd24e6529fc454588a7b
    Merge: e6013737 ece857c
    Author: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee>
    Date:   Tue Oct 18 16:52:32 2022 +0300
    
        Merge branch 'jhipster_upgrade' into feature/NT-497
    
    commit ece857c09423f967d249218dc6c54098faaff0ed
    Author: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee>
    Date:   Tue Oct 18 16:52:31 2022 +0300
    
        Generated with JHipster 6.10.1
    94789a8a
    Pull request #82: NT-497 JHipster versiooniuuendamine
    Nikolai Voitsehhovski authored
    
    
    Merge in CONSENT/servicedeclaration from feature/NT-497 to develop
    
    Squashed commit of the following:
    
    commit 9dc137c7347450884ec449335ca4fff9753c0b4c
    Author: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee>
    Date:   Thu Nov 3 14:09:30 2022 +0200
    
        NT-497 JHipster versiooniuuendamine #fix
    Signed-off-by: default avatarNikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee>
    
    commit af3f4b112d059f8b97d9ca054f67574ddbead10b
    Merge: 60afb71 98287a4
    Author: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee>
    Date:   Thu Nov 3 10:23:49 2022 +0200
    
        Merge branch 'jhipster_upgrade' into feature/NT-497
    
        # Conflicts:
        #	.yo-rc.json
        #	README.md
        #	build.gradle
        #	checkstyle.xml
        #	gradle.properties
        #	gradle/wrapper/gradle-wrapper.properties
        #	gradlew
        #	settings.gradle
        #	sonar-project.properties
        #	src/main/java/ee/ria/consentmanagement/ServiceDeclarationApp.java
        #	src/main/java/ee/ria/consentmanagement/aop/logging/LoggingAspect.java
        #	src/main/java/ee/ria/consentmanagement/client/UserFeignClientInterceptor.java
        #	src/main/java/ee/ria/consentmanagement/config/ApplicationProperties.java
        #	src/main/java/ee/ria/consentmanagement/config/AsyncConfiguration.java
        #	src/main/java/ee/ria/consentmanagement/config/Constants.java
        #	src/main/java/ee/ria/consentmanagement/config/DatabaseConfiguration.java
        #	src/main/java/ee/ria/consentmanagement/config/LiquibaseConfiguration.java
        #	src/main/java/ee/ria/consentmanagement/config/LocaleConfiguration.java
        #	src/main/java/ee/ria/consentmanagement/config/LoggingAspectConfiguration.java
        #	src/main/java/ee/ria/consentmanagement/config/LoggingConfiguration.java
        #	src/main/java/ee/ria/consentmanagement/config/OpenApiConfiguration.java
        #	src/main/java/ee/ria/consentmanagement/config/SecurityConfiguration.java
        #	src/main/java/ee/ria/consentmanagement/config/WebConfigurer.java
        #	src/main/java/ee/ria/consentmanagement/config/audit/AuditEventConverter.java
        #	src/main/java/ee/ria/consentmanagement/domain/AbstractAuditingEntity.java
        #	src/main/java/ee/ria/consentmanagement/domain/PersistentAuditEvent.java
        #	src/main/java/ee/ria/consentmanagement/security/AuthoritiesConstants.java
        #	src/main/java/ee/ria/consentmanagement/security/SecurityUtils.java
        #	src/main/java/ee/ria/consentmanagement/security/SpringSecurityAuditorAware.java
        #	src/main/java/ee/ria/consentmanagement/security/jwt/JwtFilter.java
        #	src/main/java/ee/ria/consentmanagement/security/jwt/TokenProvider.java
        #	src/main/java/ee/ria/consentmanagement/web/rest/errors/BadRequestAlertException.java
        #	src/main/java/ee/ria/consentmanagement/web/rest/errors/ErrorConstants.java
        #	src/main/java/ee/ria/consentmanagement/web/rest/errors/ExceptionTranslator.java
        #	src/main/java/ee/ria/consentmanagement/web/rest/errors/FieldErrorVM.java
        #	src/main/resources/config/application.yml
        #	src/main/resources/config/liquibase/changelog/00000000000000_initial_schema.xml
        #	src/main/resources/config/liquibase/master.xml
        #	src/main/resources/logback-spring.xml
        #	src/main/resources/static/index.html
        #	src/main/resources/templates/error.html
        #	src/test/java/ee/ria/consentmanagement/ArchTest.java
        #	src/test/java/ee/ria/consentmanagement/config/WebConfigurerTest.java
        #	src/test/java/ee/ria/consentmanagement/config/timezone/HibernateTimeZoneIT.java
        #	src/test/java/ee/ria/consentmanagement/repository/timezone/DateTimeWrapper.java
        #	src/test/java/ee/ria/consentmanagement/repository/timezone/DateTimeWrapperRepository.java
        #	src/test/java/ee/ria/consentmanagement/security/SecurityUtilsUnitTest.java
        #	src/test/java/ee/ria/consentmanagement/security/jwt/JwtFilterTest.java
        #	src/test/java/ee/ria/consentmanagement/security/jwt/TokenProviderTest.java
        #	src/test/java/ee/ria/consentmanagement/web/rest/TestUtil.java
        #	src/test/java/ee/ria/consentmanagement/web/rest/errors/ExceptionTranslatorIT.java
        #	src/test/java/ee/ria/consentmanagement/web/rest/errors/ExceptionTranslatorTestController.java
        #	src/test/resources/config/application-testcontainers.yml
        #	src/test/resources/config/application.yml
        #	src/test/resources/logback.xml
    
    commit 98287a4e0391978d5b1c95c5ab85f92ddb348adc
    Author: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee>
    Date:   Tue Oct 18 16:53:09 2022 +0300
    
        Generated with JHipster 7.9.3
    
    commit 60afb71234779937950bfd24e6529fc454588a7b
    Merge: e6013737 ece857c
    Author: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee>
    Date:   Tue Oct 18 16:52:32 2022 +0300
    
        Merge branch 'jhipster_upgrade' into feature/NT-497
    
    commit ece857c09423f967d249218dc6c54098faaff0ed
    Author: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee>
    Date:   Tue Oct 18 16:52:31 2022 +0300
    
        Generated with JHipster 6.10.1
Loading