Merge branch 'develop' into feature/pathItems

# Conflicts:
#	.github/super-linter.env

Author: makeev-pavel

.github/super-linter.env

@@ -40,3 +40,6 @@ VALIDATE_TYPESCRIPT_STANDARD=false
 # Skip OPENAPI check by CHECKOV for this repo as it contains invalid OAS 3.0 specs for testing purposes
 VALIDATE_CHECKOV=false
 VALIDATE_OPENAPI=false
+
+# Skip checking of specially broken specifications
+FILTER_REGEX_EXCLUDE=test/projects/broken/.*

.github/workflows/delete-dist-tag.yaml

@@ -5,4 +5,4 @@ on:
 
 jobs:
   delete-dist-tag:
-    uses: netcracker/qubership-apihub-ci/.github/workflows/delete-dist-tag.yaml@main
+    uses: netcracker/qubership-apihub-ci/.github/workflows/delete-dist-tag.yaml@main

test/merge/openapi/paths-from-specs/1.yaml

@@ -13,4 +13,4 @@ paths:
       responses:
         '200':
           description: OK
-          content: { }
+          content: {}

test/merge/openapi/paths-from-specs/2.yaml

@@ -13,4 +13,4 @@ paths:
       responses:
         '200':
           description: OK
-          content: { }
+          content: {}

test/merge/openapi/paths-from-specs/result.yaml

@@ -13,7 +13,7 @@ paths:
       responses:
         '200':
           description: OK
-          content: { }
+          content: {}
   /path2:
     post:
       parameters:
@@ -24,4 +24,4 @@ paths:
       responses:
         '200':
           description: OK
-          content: { }
+          content: {}

test/merge/openapi/security-from-specs/1.yaml

@@ -3,4 +3,4 @@ info:
   title: test
   version: 0.1.0
 security:
-  - oAuthSample: [ ]
+  - oAuthSample: []

test/merge/openapi/security-from-specs/2.yaml

@@ -3,4 +3,4 @@ info:
   title: test
   version: 0.1.0
 security:
-  - oAuthSample: [ ]
+  - oAuthSample: []

test/merge/openapi/security-from-specs/result.yaml

@@ -3,4 +3,4 @@ info:
   title: test
   version: 0.1.0
 security:
-  - oAuthSample: [ ]
+  - oAuthSample: []

test/merge/openapi/security-from-template/1.yaml

@@ -3,4 +3,4 @@ info:
   title: test
   version: 0.1.0
 security:
-  - oAuthSample: [ ]
+  - oAuthSample: []

test/merge/openapi/security-from-template/result.yaml

@@ -3,5 +3,5 @@ info:
   title: test
   version: 0.1.0
 security:
-  - ApiKeyAuth1: [ ]
-  - ApiKeyAuth2: [ ]
+  - ApiKeyAuth1: []
+  - ApiKeyAuth2: []