Merge branch 'master' into surefire-2.22.2

Author: sullis

README.md

@@ -103,7 +103,7 @@ You can include this library from Sonatype OSS for SNAPSHOTS, or Maven central f
 <dependency>
   <groupId>io.swagger.parser.v3</groupId>
   <artifactId>swagger-parser</artifactId>
-  <version>2.0.17</version>
+  <version>2.0.18</version>
 </dependency>
 ```
 

modules/swagger-parser-core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.18-SNAPSHOT</version>
+        <version>2.0.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-parser-v2-converter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.18-SNAPSHOT</version>
+        <version>2.0.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-parser-v3/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.18-SNAPSHOT</version>
+        <version>2.0.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java

@@ -66,6 +66,18 @@ public class OpenAPIV3ParserTest {
     protected int serverPort = getDynamicPort();
     protected WireMockServer wireMockServer;
 
+    @Test
+    public void testIssue1309() {
+        OpenAPIV3Parser openApiParser = new OpenAPIV3Parser();
+        ParseOptions options = new ParseOptions();
+        options.setResolve(true);
+        SwaggerParseResult parseResult = openApiParser.readLocation("issue-1309.yaml", null, options);
+
+        OpenAPI openAPI = parseResult.getOpenAPI();
+        assertNotNull(openAPI);
+        assertEquals(parseResult.getMessages().get(0),"attribute components.schemas.customer-not-found.examples is unexpected");
+    }
+
     @Test
     public void testIssue1316() {
         OpenAPIV3Parser openApiParser = new OpenAPIV3Parser();
@@ -76,7 +88,6 @@ public void testIssue1316() {
         OpenAPI openAPI = parseResult.getOpenAPI();
         assertNotNull(openAPI);
         assertTrue(parseResult.getMessages().size() == 0);
-
     }
 
 

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIV3ParserTest.java

@@ -0,0 +1,27 @@
+---
+openapi: 3.0.1
+info:
+  title: Regular Expression Issue
+  version: 0.0.2
+paths:
+  "/test":
+    get:
+      responses:
+        '200':
+          description: It works
+        '400':
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                type: object
+              examples:
+                Entity not found:
+                  summary: Item not existing
+components:
+  schemas:
+    customer-not-found:
+      type: object
+      examples:
+        Customer not found:
+          summary: Customer not existing

modules/swagger-parser-v3/src/test/resources/issue-1309.yaml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.18-SNAPSHOT</version>
+        <version>2.0.18</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-parser/pom.xml

@@ -8,7 +8,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.swagger.parser.v3</groupId>
     <artifactId>swagger-parser-project</artifactId>
-    <version>2.0.18-SNAPSHOT</version>
+    <version>2.0.18</version>
     <packaging>pom</packaging>
     <name>swagger-parser-project</name>
     <developers>
@@ -285,7 +285,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-v2-version>1.0.50-SNAPSHOT</swagger-parser-v2-version>
+        <swagger-parser-v2-version>1.0.50</swagger-parser-v2-version>
         <commons-io-version>2.6</commons-io-version>
         <slf4j-version>1.7.30</slf4j-version>
         <swagger-core-version>2.1.1</swagger-core-version>