Merge branch 'master' into swos149_2

Author: gracekarina

modules/swagger-generator/pom.xml

@@ -271,7 +271,7 @@
             <artifactId>jetty-deploy</artifactId>
             <version>${jetty-version}</version>
         </dependency>
-             
+
         <dependency>
            <groupId>javax.xml.bind</groupId>
            <artifactId>jaxb-api</artifactId>
@@ -286,8 +286,8 @@
            <groupId>com.sun.xml.bind</groupId>
            <artifactId>jaxb-impl</artifactId>
            <version>2.3.0</version>
-         </dependency>     
-             
+         </dependency>
+
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-runner</artifactId>