Merge branch 'develop_2.0' of github.com:swagger-api/swagger-core into develop_2.0

Author: fehguy

.travis.yml

@@ -1,3 +1,4 @@
+sudo: false
 language: java
 script: mvn clean verify
 jdk:

modules/swagger-core/src/test/scala/specFiles/compositionTest.json

@@ -6,7 +6,7 @@
       "title": "Swagger Petstore",
       "termsOfService": "http://helloreverb.com/terms/",
       "contact": {
-        "name": "apiteam@wordnik.com"
+        "name": "apiteam@swagger.io"
       },
       "license": {
         "name": "Apache 2.0",

samples/java-grails2/web-app/WEB-INF/applicationContext.xml

@@ -30,7 +30,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
     <property name="basePath" value="http://localhost:8080/java-grails2/api"/>
     <property name="title" value="Petstore sample app"/>
     <property name="description" value="This is a app."/>
-    <property name="contact" value="apiteam@wordnik.com"/>
+    <property name="contact" value="apiteam@swagger.io"/>
     <property name="license" value="Apache 2.0 License"/>
     <property name="licenseUrl" value="http://www.apache.org/licenses/LICENSE-2.0.html"/>
     <property name="scan" value="true"/>

samples/java-jaxrs-cxf/src/main/resources/applicationContext.xml

@@ -45,7 +45,7 @@
     <property name="basePath" value="/api"/>
     <property name="title" value="Petstore sample app"/>
     <property name="description" value="This is a app."/>
-    <property name="contact" value="apiteam@wordnik.com"/>
+    <property name="contact" value="apiteam@swagger.io"/>
     <property name="license" value="Apache 2.0 License"/>
     <property name="licenseUrl" value="http://www.apache.org/licenses/LICENSE-2.0.html"/>
     <!-- <property name="filterClass" value="com.wordnik.swagger.sample.util.ApiAuthorizationFilterImpl"/> -->

samples/java-jaxrs-cxf/src/test/scala/ResourceListingIT.scala

@@ -25,7 +25,7 @@ class ResourceListingIT extends FlatSpec with Matchers {
     info.getVersion() should be ("1.0.0")
     info.getTitle() should be ("Petstore sample app")
     info.getContact() should not be (null)
-    info.getContact().getName() should be ("apiteam@wordnik.com")
+    info.getContact().getName() should be ("apiteam@swagger.io")
     info.getLicense() should not be (null)
     info.getLicense().getName() should be ("Apache 2.0 License")
   }

samples/java-jaxrs-no-webxml/src/main/java/com/wordnik/swagger/sample/Bootstrap.java

@@ -24,7 +24,7 @@ public void init(ServletConfig config) throws ServletException {
         "you can use the api key \"special-key\" to test the authorization filters")
       .termsOfService("http://helloreverb.com/terms/")
       .contact(new Contact()
-        .email("apiteam@wordnik.com"))
+        .email("apiteam@swagger.io"))
       .license(new License()
         .name("Apache 2.0")
         .url("http://www.apache.org/licenses/LICENSE-2.0.html"));

samples/java-jaxrs-no-webxml/src/test/scala/ResourceListingIT.scala

@@ -27,7 +27,7 @@ class ResourceListingIT extends FlatSpec with Matchers {
     info.getVersion() should be ("1.0.0")
     info.getTitle() should be ("Petstore sample app")
     info.getContact() should not be (null)
-    info.getContact().getName() should be ("apiteam@wordnik.com")
+    info.getContact().getName() should be ("apiteam@swagger.io")
     info.getLicense() should not be (null)
     info.getLicense().getName() should be ("Apache 2.0 License")
   }

samples/java-jaxrs/src/main/java/com/wordnik/swagger/sample/Bootstrap.java

@@ -19,7 +19,7 @@ public void init(ServletConfig config) throws ServletException {
         "you can use the api key \"special-key\" to test the authorization filters")
       .termsOfService("http://helloreverb.com/terms/")
       .contact(new Contact()
-        .email("apiteam@wordnik.com"))
+        .email("apiteam@swagger.io"))
       .license(new License()
         .name("Apache 2.0")
         .url("http://www.apache.org/licenses/LICENSE-2.0.html"));

samples/java-jaxrs/src/test/scala/ResourceListingIT.scala

@@ -27,7 +27,7 @@ class ResourceListingIT extends FlatSpec with Matchers {
     info.getVersion() should be ("1.0.0")
     info.getTitle() should be ("Petstore sample app")
     info.getContact() should not be (null)
-    info.getContact().getName() should be ("apiteam@wordnik.com")
+    info.getContact().getName() should be ("apiteam@swagger.io")
     info.getLicense() should not be (null)
     info.getLicense().getName() should be ("Apache 2.0 License")
   }

samples/java-jersey-jaxrs/src/main/java/com/wordnik/swagger/sample/Bootstrap.java

@@ -19,7 +19,7 @@ public void init(ServletConfig config) throws ServletException {
         "you can use the api key \"special-key\" to test the authorization filters")
       .termsOfService("http://helloreverb.com/terms/")
       .contact(new Contact()
-        .email("apiteam@wordnik.com"))
+        .email("apiteam@swagger.io"))
       .license(new License()
         .name("Apache 2.0")
         .url("http://www.apache.org/licenses/LICENSE-2.0.html"));