-
Nikolai Voitsehhovski authored
Merge in CONSENT/organisation from feature/NT-497 to develop Squashed commit of the following: commit 240df8efd8f673c3773e593b0d6514b021dd3336 Merge: 4b0c901 d93ec34 Author: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee> Date: Mon Oct 17 17:49:47 2022 +0300 Merge branch 'jhipster_upgrade' into feature/NT-497 # Conflicts: # .yo-rc.json # README.md # build.gradle # checkstyle.xml # gradle.properties # gradle/war.gradle # gradle/wrapper/gradle-wrapper.jar # gradle/wrapper/gradle-wrapper.properties # gradlew # settings.gradle # sonar-project.properties # src/main/docker/app.yml # src/main/docker/monitoring.yml # src/main/docker/postgresql.yml # src/main/docker/sonar.yml # src/main/java/ee/ria/consentmanagement/DataProviderApp.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/jib/entrypoint.sh # 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/i18n/messages.properties # src/main/resources/i18n/messages_en.properties # src/main/resources/i18n/messages_et.properties # 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/WebConfigurerTestController.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/i18n/messages_en.properties # src/test/resources/logback.xml Signed-off-by: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee> commit d93ec3431ff36411305fce36bbf955c90a70e303 Author: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee> Date: Thu Oct 13 10:24:05 2022 +0300 Generated with JHipster 7.9.3 commit 4b0c90126997bed7407ee037e58800e1b0ff2efc Merge: 584f9f13 3136df3 Author: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee> Date: Thu Oct 13 10:23:22 2022 +0300 Merge branch 'jhipster_upgrade' into feature/NT-497 commit 3136df3af67203eff5031aa41eb14ddf87aa9b8f Author: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee> Date: Thu Oct 13 10:23:21 2022 +0300 Generated with JHipster 6.10.1
3c5bdee9Nikolai Voitsehhovski authoredMerge in CONSENT/organisation from feature/NT-497 to develop Squashed commit of the following: commit 240df8efd8f673c3773e593b0d6514b021dd3336 Merge: 4b0c901 d93ec34 Author: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee> Date: Mon Oct 17 17:49:47 2022 +0300 Merge branch 'jhipster_upgrade' into feature/NT-497 # Conflicts: # .yo-rc.json # README.md # build.gradle # checkstyle.xml # gradle.properties # gradle/war.gradle # gradle/wrapper/gradle-wrapper.jar # gradle/wrapper/gradle-wrapper.properties # gradlew # settings.gradle # sonar-project.properties # src/main/docker/app.yml # src/main/docker/monitoring.yml # src/main/docker/postgresql.yml # src/main/docker/sonar.yml # src/main/java/ee/ria/consentmanagement/DataProviderApp.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/jib/entrypoint.sh # 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/i18n/messages.properties # src/main/resources/i18n/messages_en.properties # src/main/resources/i18n/messages_et.properties # 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/WebConfigurerTestController.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/i18n/messages_en.properties # src/test/resources/logback.xml Signed-off-by: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee> commit d93ec3431ff36411305fce36bbf955c90a70e303 Author: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee> Date: Thu Oct 13 10:24:05 2022 +0300 Generated with JHipster 7.9.3 commit 4b0c90126997bed7407ee037e58800e1b0ff2efc Merge: 584f9f13 3136df3 Author: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee> Date: Thu Oct 13 10:23:22 2022 +0300 Merge branch 'jhipster_upgrade' into feature/NT-497 commit 3136df3af67203eff5031aa41eb14ddf87aa9b8f Author: Nikolai Voitsehhovski <nikolai.voitsehhovski@finestmedia.ee> Date: Thu Oct 13 10:23:21 2022 +0300 Generated with JHipster 6.10.1
Loading