From 66022a1f2267c3515e42b47b4b565872df1ae35b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Bresson?= <dev@jmini.fr>
Date: Tue, 4 Sep 2018 15:46:46 +0200
Subject: [PATCH] Update swagger-parser to v2.0.3-OpenAPITools.org-1 (#951)

* Update swagger-parser to v2.0.3-OpenAPITools.org-1
* Run bin/rust-server-petstore.sh
---
 CI/pom.xml.bash                                                 | 2 +-
 CI/pom.xml.circleci                                             | 2 +-
 CI/pom.xml.circleci.java7                                       | 2 +-
 CI/pom.xml.ios                                                  | 2 +-
 pom.xml                                                         | 2 +-
 .../rust-server/output/rust-server-test/api/openapi.yaml        | 2 ++
 .../rust-server/output/rust-server-test/src/client/mod.rs       | 2 +-
 .../petstore/rust-server/output/rust-server-test/src/lib.rs     | 2 +-
 .../rust-server/output/rust-server-test/src/server/mod.rs       | 2 +-
 9 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CI/pom.xml.bash b/CI/pom.xml.bash
index db47a951971..a17e0ae51a9 100644
--- a/CI/pom.xml.bash
+++ b/CI/pom.xml.bash
@@ -920,7 +920,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>2.0.2-OpenAPITools.org-1</swagger-parser-version>
+        <swagger-parser-version>2.0.3-OpenAPITools.org-1</swagger-parser-version>
         <swagger-core-version>2.0.1</swagger-core-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
diff --git a/CI/pom.xml.circleci b/CI/pom.xml.circleci
index 919bd961436..e49833ab326 100644
--- a/CI/pom.xml.circleci
+++ b/CI/pom.xml.circleci
@@ -1030,7 +1030,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>2.0.2-OpenAPITools.org-1</swagger-parser-version>
+        <swagger-parser-version>2.0.3-OpenAPITools.org-1</swagger-parser-version>
         <swagger-core-version>2.0.1</swagger-core-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
diff --git a/CI/pom.xml.circleci.java7 b/CI/pom.xml.circleci.java7
index 2fe52837a87..3713c48fa68 100644
--- a/CI/pom.xml.circleci.java7
+++ b/CI/pom.xml.circleci.java7
@@ -1000,7 +1000,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>2.0.2-OpenAPITools.org-1</swagger-parser-version>
+        <swagger-parser-version>2.0.3-OpenAPITools.org-1</swagger-parser-version>
         <swagger-core-version>2.0.1</swagger-core-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
diff --git a/CI/pom.xml.ios b/CI/pom.xml.ios
index f77dfc9f1c9..ffbf423381e 100644
--- a/CI/pom.xml.ios
+++ b/CI/pom.xml.ios
@@ -928,7 +928,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>2.0.2-OpenAPITools.org-1</swagger-parser-version>
+        <swagger-parser-version>2.0.3-OpenAPITools.org-1</swagger-parser-version>
         <swagger-core-version>2.0.1</swagger-core-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
diff --git a/pom.xml b/pom.xml
index 5c1ae35b957..31438e91cf5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1135,7 +1135,7 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <swagger-parser-version>2.0.2-OpenAPITools.org-1</swagger-parser-version>
+        <swagger-parser-version>2.0.3-OpenAPITools.org-1</swagger-parser-version>
         <swagger-core-version>2.0.1</swagger-core-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
diff --git a/samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml b/samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml
index 3801e933580..3ad35a166ff 100644
--- a/samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml
+++ b/samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml
@@ -3,6 +3,8 @@ info:
   description: This spec is for testing rust-server-specific things
   title: rust-server-test
   version: 1.0.0
+servers:
+- url: /
 paths:
   /dummy:
     get:
diff --git a/samples/server/petstore/rust-server/output/rust-server-test/src/client/mod.rs b/samples/server/petstore/rust-server/output/rust-server-test/src/client/mod.rs
index 78aa49e0085..3f868e0407c 100644
--- a/samples/server/petstore/rust-server/output/rust-server-test/src/client/mod.rs
+++ b/samples/server/petstore/rust-server/output/rust-server-test/src/client/mod.rs
@@ -249,7 +249,7 @@ impl<F, C> Api<C> for Client<F> where
 
 
         let uri = format!(
-            "{}/dummy",
+            "{}//dummy",
             self.base_path
         );
 
diff --git a/samples/server/petstore/rust-server/output/rust-server-test/src/lib.rs b/samples/server/petstore/rust-server/output/rust-server-test/src/lib.rs
index aceb8e42ccc..50b0fc6207f 100644
--- a/samples/server/petstore/rust-server/output/rust-server-test/src/lib.rs
+++ b/samples/server/petstore/rust-server/output/rust-server-test/src/lib.rs
@@ -35,7 +35,7 @@ mod mimetypes;
 
 pub use swagger::{ApiError, ContextWrapper};
 
-pub const BASE_PATH: &'static str = "";
+pub const BASE_PATH: &'static str = "/";
 pub const API_VERSION: &'static str = "1.0.0";
 
 
diff --git a/samples/server/petstore/rust-server/output/rust-server-test/src/server/mod.rs b/samples/server/petstore/rust-server/output/rust-server-test/src/server/mod.rs
index 919e430b084..f15596204ed 100644
--- a/samples/server/petstore/rust-server/output/rust-server-test/src/server/mod.rs
+++ b/samples/server/petstore/rust-server/output/rust-server-test/src/server/mod.rs
@@ -51,7 +51,7 @@ mod paths {
 
     lazy_static! {
         pub static ref GLOBAL_REGEX_SET: regex::RegexSet = regex::RegexSet::new(&[
-            r"^/dummy$"
+            r"^//dummy$"
         ]).unwrap();
     }
     pub static ID_DUMMY: usize = 0;