Upgraded swagger-models library to 1.5.3-M1.

thboileau · thboileau · commit 455c1075f902 · 2015-05-01T11:55:53.000+02:00
diff --git a/build/tmpl/text/changes.txt b/build/tmpl/text/changes.txt
@@ -33,6 +33,7 @@ Changes log
       - Allowed to turn off header cleaning in Redirector for server-side 
         redirects. Issue #799.
         Suggested by Tal Liron.
+      - Upgraded swagger-models library to 1.5.3-M1.
 
 - 2.3.1 (02/03/2015)
     - Bugs fixed
diff --git a/libraries/com.wordnik.swagger.annotations_1.5/com.wordnik.swagger.annotations.jar b/libraries/com.wordnik.swagger.annotations_1.5/com.wordnik.swagger.annotations.jar
diff --git a/libraries/com.wordnik.swagger.annotations_1.5/library.xml b/libraries/com.wordnik.swagger.annotations_1.5/library.xml
@@ -2,6 +2,7 @@
 	<name>Swagger</name>
 	<description>Swagger document your API with style. Swagger spec compatibility: 2.0</description>
 	<version>1.5</version>
+	<release>3-M1</release>
 	<homeUri>https://helloreverb.com/developers/swagger</homeUri>
 	<downloadUri>https://github.com/wordnik/swagger-core/wiki/Downloads
 	</downloadUri>
@@ -11,12 +12,10 @@
 		<maven>
 			<groupId>com.wordnik</groupId>
 			<artifactId>swagger-annotations</artifactId>
-			<version>1.5.0-SNAPSHOT</version>
 		</maven>
 	</package>
 	<dependency type="library" id="scala" />
 	<distributions>
-		<distribution id="maven" />
 		<distribution id="classic" />
 	</distributions>
 </library>
diff --git a/libraries/com.wordnik.swagger.core_1.5/com.wordnik.swagger.core.jar b/libraries/com.wordnik.swagger.core_1.5/com.wordnik.swagger.core.jar
diff --git a/libraries/com.wordnik.swagger.core_1.5/library.xml b/libraries/com.wordnik.swagger.core_1.5/library.xml
@@ -2,6 +2,7 @@
 	<name>Swagger</name>
 	<description>Swagger document your API with style. Swagger spec compatibility: 2.0</description>
 	<version>1.5</version>
+	<release>3-M1</release>
 	<homeUri>https://helloreverb.com/developers/swagger</homeUri>
 	<downloadUri>https://github.com/wordnik/swagger-core/wiki/Downloads
 	</downloadUri>
@@ -11,10 +12,9 @@
 		<maven>
 			<groupId>com.wordnik</groupId>
 			<artifactId>swagger-core</artifactId>
-			<version>1.5.0-SNAPSHOT</version>
 		</maven>
 	</package>
 	<distributions>
-		<distribution id="maven" />
+		<distribution id="classic" />
 	</distributions>
 </library>
diff --git a/libraries/com.wordnik.swagger.models_1.5/com.wordnik.swagger.models.jar b/libraries/com.wordnik.swagger.models_1.5/com.wordnik.swagger.models.jar
diff --git a/libraries/com.wordnik.swagger.models_1.5/library.xml b/libraries/com.wordnik.swagger.models_1.5/library.xml
@@ -2,6 +2,7 @@
 	<name>Swagger</name>
 	<description>Swagger document your API with style. Swagger spec compatibility: 2.0</description>
 	<version>1.5</version>
+	<release>3-M1</release>
 	<homeUri>https://helloreverb.com/developers/swagger</homeUri>
 	<downloadUri>https://github.com/wordnik/swagger-core/wiki/Downloads
 	</downloadUri>
@@ -11,11 +12,9 @@
 		<maven>
 			<groupId>com.wordnik</groupId>
 			<artifactId>swagger-models</artifactId>
-			<version>1.5.0-SNAPSHOT</version>
 		</maven>
 	</package>
 	<distributions>
 		<distribution id="classic" />
-		<distribution id="maven" />
 	</distributions>
 </library>
diff --git a/libraries/org.simpleframework.xml_2.7/library.xml b/libraries/org.simpleframework.xml_2.7/library.xml
@@ -1,8 +1,8 @@
 <library id="simple-xml" symbolicName="org.simpleframework.xml">
 	<name>Simple XML</name>
 	<description>Simple XML.</description>
-	<version>2.7.1</version>
-	<!-- <release>6</release> -->
+	<version>2.7</version>
+	<release>1</release>
 	<homeUri>http://simple.sourceforge.net/</homeUri>
 	<downloadUri>http://simple.sourceforge.net/download.php</downloadUri>
 	<provider>Niall Gallagher</provider>
diff --git a/modules/org.restlet.test/src/org/restlet/test/ext/apispark/conversion/swagger/v2_0/Swagger2CompositeTranslatorTestCase.java b/modules/org.restlet.test/src/org/restlet/test/ext/apispark/conversion/swagger/v2_0/Swagger2CompositeTranslatorTestCase.java
@@ -39,7 +39,6 @@
 
 import com.wordnik.swagger.models.Model;
 import com.wordnik.swagger.models.Swagger;
-import com.wordnik.swagger.util.SwaggerLoader;
 
 public class Swagger2CompositeTranslatorTestCase extends Swagger2TestCase {
 
@@ -95,7 +94,7 @@ public void testGetSwagger2() throws IOException {
                 .getSwagger(savedDefinition);
 
         URL refImpl = getClass().getResource("refImpl.composite.swagger");
-        Swagger savedSwagger = new SwaggerLoader().read(refImpl.getFile());
+        Swagger savedSwagger = SwaggerLoader.readJson(refImpl.getFile());
 
         compareSwaggerBeans(savedSwagger, translatedSwagger);
         compareSwaggerBeans(translatedSwagger, savedSwagger);
diff --git a/modules/org.restlet.test/src/org/restlet/test/ext/apispark/conversion/swagger/v2_0/Swagger2TranslatorTestCase.java b/modules/org.restlet.test/src/org/restlet/test/ext/apispark/conversion/swagger/v2_0/Swagger2TranslatorTestCase.java
@@ -62,7 +62,6 @@
 import com.wordnik.swagger.models.properties.IntegerProperty;
 import com.wordnik.swagger.models.properties.RefProperty;
 import com.wordnik.swagger.models.properties.StringProperty;
-import com.wordnik.swagger.util.SwaggerLoader;
 
 public class Swagger2TranslatorTestCase extends Swagger2TestCase {
 
@@ -369,8 +368,7 @@ public void testGetSwagger2() throws IOException {
                 .getSwagger(savedDefinition);
 
         URL refImpl = getClass().getResource("refImpl.swagger");
-        @SuppressWarnings("deprecation")
-        Swagger savedSwagger = new SwaggerLoader().read(refImpl.getFile());
+        Swagger savedSwagger = SwaggerLoader.readJson(refImpl.getFile());
 
         compareSwaggerBeans(savedSwagger, translatedSwagger);
     }
diff --git a/modules/org.restlet.test/src/org/restlet/test/ext/apispark/conversion/swagger/v2_0/SwaggerLoader.java b/modules/org.restlet.test/src/org/restlet/test/ext/apispark/conversion/swagger/v2_0/SwaggerLoader.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2005-2014 Restlet
+ * 
+ * The contents of this file are subject to the terms of one of the following
+ * open source licenses: Apache 2.0 or or EPL 1.0 (the "Licenses"). You can
+ * select the license that you prefer but you may not use this file except in
+ * compliance with one of these Licenses.
+ * 
+ * You can obtain a copy of the Apache 2.0 license at
+ * http://www.opensource.org/licenses/apache-2.0
+ * 
+ * You can obtain a copy of the EPL 1.0 license at
+ * http://www.opensource.org/licenses/eclipse-1.0
+ * 
+ * See the Licenses for the specific language governing permissions and
+ * limitations under the Licenses.
+ * 
+ * Alternatively, you can obtain a royalty free commercial license with less
+ * limitations, transferable or non-transferable, directly at
+ * http://restlet.com/products/restlet-framework
+ * 
+ * Restlet is a registered trademark of Restlet S.A.S.
+ */
+
+package org.restlet.test.ext.apispark.conversion.swagger.v2_0;
+
+import java.io.File;
+import java.io.IOException;
+
+import com.wordnik.swagger.models.Swagger;
+import com.wordnik.swagger.util.Json;
+
+public class SwaggerLoader {
+
+    public static Swagger readJson(File file) throws IOException {
+        return Json.mapper().readValue(file, Swagger.class);
+    }
+
+    public static Swagger readJson(String file) throws IOException {
+        return readJson(new File(file));
+    }
+
+}
