Skip to content
Snippets Groups Projects
Commit 6c64ce4f authored by Evgeny Bardin's avatar Evgeny Bardin
Browse files

Merge branch 'main' into OZG-7092-Refactor-Interface

# Conflicts:
#	Jenkinsfile
#	token-checker-server/src/main/helm/templates/configmap_bindings_type.yaml
#	token-checker-server/src/main/java/de/ozgcloud/token/GrpcTokenCheckService.java
#	token-checker-server/src/main/java/de/ozgcloud/token/TokenCheckConfiguration.java
#	token-checker-server/src/main/java/de/ozgcloud/token/TokenCheckMapper.java
#	token-checker-server/src/main/java/de/ozgcloud/token/TokenCheckService.java
#	token-checker-server/src/main/java/de/ozgcloud/token/common/errorhandling/ValidationError.java
#	token-checker-server/src/main/java/de/ozgcloud/token/saml/ConfigurationEntity.java
#	token-checker-server/src/main/java/de/ozgcloud/token/saml/Saml2DecryptionService.java
#	token-checker-server/src/main/java/de/ozgcloud/token/saml/Saml2ParseService.java
#	token-checker-server/src/main/java/de/ozgcloud/token/saml/Saml2VerificationService.java
#	token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlConfiguration.java
#	token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlConfigurationRegistry.java
#	token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlServiceRegistry.java
#	token-checker-server/src/main/java/de/ozgcloud/token/saml/SamlTokenUtils.java
#	token-checker-server/src/test/helm/configmap_bindings_type_test.yaml
#	token-checker-server/src/test/java/de/ozgcloud/token/GrpcTokenCheckServiceTest.java
#	token-checker-server/src/test/java/de/ozgcloud/token/TokenCheckMapperTest.java
#	token-checker-server/src/test/java/de/ozgcloud/token/TokenCheckPropertiesITCase.java
#	token-checker-server/src/test/java/de/ozgcloud/token/TokenCheckServiceTest.java
#	token-checker-server/src/test/java/de/ozgcloud/token/TokenCheckTestConfiguration.java
#	token-checker-server/src/test/java/de/ozgcloud/token/saml/Saml2DecryptionServiceTest.java
#	token-checker-server/src/test/java/de/ozgcloud/token/saml/Saml2ParseServiceTest.java
#	token-checker-server/src/test/java/de/ozgcloud/token/saml/Saml2VerificationServiceTest.java
#	token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlTokenTestUtils.java
#	token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlTokenUtilsTest.java
parents 07f2124d 31dd9e10
No related branches found
No related tags found
Loading
Showing
with 212 additions and 141 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment