Skip to content
Snippets Groups Projects
Select Git revision
  • 4a9d61c3cae5870a37b0b991865e73b376670915
  • main default protected
2 results

Jenkinsfile

Blame
    • Evgeny Bardin's avatar
      6c64ce4f
      Merge branch 'main' into OZG-7092-Refactor-Interface · 6c64ce4f
      Evgeny Bardin authored
      # 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
      6c64ce4f
      History
      Merge branch 'main' into OZG-7092-Refactor-Interface
      Evgeny Bardin authored
      # 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
    Jenkinsfile 12.63 KiB