updated versions

fehguy · fehguy · commit ed81ae7d950d · 2015-02-01T02:48:29.000-08:00
diff --git a/modules/swagger-annotations/pom.xml b/modules/swagger-annotations/pom.xml
@@ -3,13 +3,13 @@
   <parent>
     <groupId>com.wordnik</groupId>
     <artifactId>swagger-project</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0-M1</version>
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wordnik</groupId>
   <artifactId>swagger-annotations</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.5.0-M1</version>
   <packaging>bundle</packaging>
   <name>swagger-annotations</name>
 
diff --git a/modules/swagger-core/pom.xml b/modules/swagger-core/pom.xml
@@ -2,15 +2,15 @@
   <parent>
     <groupId>com.wordnik</groupId>
     <artifactId>swagger-project</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0-M1</version>
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wordnik</groupId>
   <artifactId>swagger-core</artifactId>
   <packaging>jar</packaging>
   <name>swagger-core</name>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.5.0-M1</version>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <defaultGoal>install</defaultGoal>
diff --git a/modules/swagger-core/src/main/java/com/wordnik/swagger/converter/ModelConverters.java b/modules/swagger-core/src/main/java/com/wordnik/swagger/converter/ModelConverters.java
@@ -7,12 +7,17 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.lang.reflect.Type;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 public class ModelConverters {
+  Logger LOGGER = LoggerFactory.getLogger(ModelConverters.class);
+
   private static final ModelConverters SINGLETON = new ModelConverters();
   private final List<ModelConverter> converters;
   private final Set<String> skippedPackages = new HashSet<String>();
@@ -44,7 +49,7 @@ public void addPackageToSkip(String pkg) {
   }
 
   public void addClassToSkip(String cls) {
-    System.out.println("skipping class " + cls);
+    LOGGER.warn("skipping class " + cls);
     this.skippedClasses.add(cls);
   }
 
diff --git a/modules/swagger-core/src/main/java/com/wordnik/swagger/util/PropertyDeserializer.java b/modules/swagger-core/src/main/java/com/wordnik/swagger/util/PropertyDeserializer.java
@@ -6,10 +6,15 @@
 import com.fasterxml.jackson.databind.deser.*; 
 import com.fasterxml.jackson.databind.node.*;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.*;
 import java.io.IOException;
 
 public class PropertyDeserializer extends JsonDeserializer<Property> {
+  Logger LOGGER = LoggerFactory.getLogger(PropertyDeserializer.class);
+
   @Override
   public Property deserialize(JsonParser jp, DeserializationContext ctxt) 
     throws IOException, JsonProcessingException {
@@ -161,7 +166,7 @@ Property propertyFromNode(JsonNode node) {
 
     Property output = PropertyBuilder.build(type, format, args);
     if(output == null) {
-      System.out.println("no property from " + type + ", " + format + ", " + args);
+      LOGGER.warn("no property from " + type + ", " + format + ", " + args);
       return null;
     }
     output.setDescription(description);
diff --git a/modules/swagger-core/src/main/java/com/wordnik/swagger/util/SwaggerLoader.java b/modules/swagger-core/src/main/java/com/wordnik/swagger/util/SwaggerLoader.java
@@ -3,10 +3,15 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.wordnik.swagger.models.Swagger;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.File;
 import java.net.URL;
 
 public class SwaggerLoader {
+  Logger LOGGER = LoggerFactory.getLogger(SwaggerLoader.class);
+
   public Swagger read(String location) {
     if(location == null)
       return null;
@@ -22,7 +27,7 @@ public Swagger read(String location) {
         mapper.readValue(new File(location), Swagger.class);
     }
     catch (Exception e) {
-      System.out.println(e.getMessage());
+      LOGGER.error("unable to read location " + location, e);
       return null;
     }
   }
diff --git a/modules/swagger-jaxrs/pom.xml b/modules/swagger-jaxrs/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <groupId>com.wordnik</groupId>
     <artifactId>swagger-project</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0-M1</version>
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wordnik</groupId>
   <artifactId>swagger-jaxrs</artifactId>
   <packaging>jar</packaging>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.5.0-M1</version>
   <name>swagger-jaxrs</name>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
diff --git a/modules/swagger-jersey-jaxrs/pom.xml b/modules/swagger-jersey-jaxrs/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <groupId>com.wordnik</groupId>
     <artifactId>swagger-project</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0-M1</version>
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wordnik</groupId>
   <artifactId>swagger-jersey-jaxrs</artifactId>
   <packaging>jar</packaging>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.5.0-M1</version>
   <name>swagger-jersey-jaxrs</name>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
diff --git a/modules/swagger-jersey2-jaxrs/pom.xml b/modules/swagger-jersey2-jaxrs/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <groupId>com.wordnik</groupId>
     <artifactId>swagger-project</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0-M1</version>
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wordnik</groupId>
   <artifactId>swagger-jersey2-jaxrs</artifactId>
   <packaging>jar</packaging>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.5.0-M1</version>
   <name>swagger-jersey2-jaxrs (Jersey 2.x support)</name>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
diff --git a/modules/swagger-models/pom.xml b/modules/swagger-models/pom.xml
@@ -2,15 +2,15 @@
   <parent>
     <groupId>com.wordnik</groupId>
     <artifactId>swagger-project</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0-M1</version>
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wordnik</groupId>
   <artifactId>swagger-models</artifactId>
   <packaging>bundle</packaging>
   <name>swagger-models</name>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.5.0-M1</version>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <defaultGoal>install</defaultGoal>
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
   <artifactId>swagger-project</artifactId>
   <packaging>pom</packaging>
   <name>wordnik-swagger-project</name>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.5.0-M1</version>
   <url>https://github.com/wordnik/swagger-core</url>
   <scm>
     <connection>scm:git:git@github.com:swagger-api/swagger-core.git</connection>
@@ -371,14 +371,10 @@
         </property>
       </activation>
       <modules>
-        <module>samples/java-resteasy</module>
         <module>samples/java-jaxrs</module>
         <module>samples/java-dropwizard</module>
-        <module>samples/scala-jaxrs</module>
-        <module>samples/scala-servlet</module>
-        <module>samples/java-jaxrs-subresource</module>
-        <module>samples/scala-jaxrs-fileupload</module>
         <module>samples/java-jaxrs-cxf</module>
+        <module>samples/java-jersey-jaxrs</module>
       </modules>
     </profile>
     <profile>
@@ -526,6 +522,7 @@
     <joda-version>1.2</joda-version>
     <joda-time-version>2.2</joda-time-version>
 
+    <swagger-ui-version>2.1.0-M1</swagger-ui-version>
     <scala-version>2.10.4</scala-version>
     <felix-version>2.3.4</felix-version>
     <servlet-api-version>2.5</servlet-api-version>
diff --git a/samples/java-dropwizard/pom.xml b/samples/java-dropwizard/pom.xml
@@ -2,15 +2,15 @@
   <parent>
     <groupId>com.wordnik</groupId>
     <artifactId>swagger-project</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.0-M1</version>
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wordnik</groupId>
   <artifactId>swagger-java-dropwizard-sample-app</artifactId>
   <packaging>jar</packaging>
   <name>swagger-java-dropwizard-app</name>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.5.0-M1</version>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
@@ -41,7 +41,7 @@
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                  <mainClass>com.wordnik.swagger.sample.SwaggerSampleService</mainClass>
+                  <mainClass>com.wordnik.swagger.sample.SwaggerSampleApplication</mainClass>
                 </transformer>
               </transformers>
             </configuration>
@@ -60,6 +60,24 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>com.googlecode.maven-download-plugin</groupId>
+        <artifactId>download-maven-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
+          <execution>
+            <id>swagger-ui</id>
+            <goals>
+              <goal>wget</goal>
+            </goals>
+            <configuration>
+              <url>https://github.com/swagger-api/swagger-ui/archive/v${swagger-ui-version}.tar.gz</url>
+              <unpack>true</unpack>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/samples/java-dropwizard/src/main/java/com/wordnik/swagger/sample/SwaggerSampleApplication.java b/samples/java-dropwizard/src/main/java/com/wordnik/swagger/sample/SwaggerSampleApplication.java
@@ -0,0 +1,35 @@
+package com.wordnik.swagger.sample;
+
+import com.wordnik.swagger.sample.resource.*;
+
+import com.wordnik.swagger.jaxrs.config.*;
+import com.wordnik.swagger.jaxrs.listing.ApiListingResource;
+import com.wordnik.swagger.config.*;
+
+import io.dropwizard.Application;
+import io.dropwizard.setup.Bootstrap;
+import io.dropwizard.setup.Environment;
+
+public class SwaggerSampleApplication extends Application <SwaggerSampleConfiguration> {
+  public static void main(String[] args) throws Exception {
+    new SwaggerSampleApplication().run(args);
+  }
+
+  @Override
+  public void initialize(Bootstrap<SwaggerSampleConfiguration> bootstrap) { }
+
+  @Override   
+  public String getName() {
+      return "swagger-sample";
+  }
+
+  @Override
+  public void run(SwaggerSampleConfiguration configuration, Environment environment) {
+    environment.jersey().register(new ApiListingResource());
+    environment.jersey().register(new PetResource());
+
+    // SwaggerConfig config = ConfigFactory.config();
+    // config.setApiVersion("1.0.1");
+    // config.setBasePath("http://localhost:8000");
+  }
+}
diff --git a/samples/java-dropwizard/src/main/java/com/wordnik/swagger/sample/SwaggerSampleConfiguration.java b/samples/java-dropwizard/src/main/java/com/wordnik/swagger/sample/SwaggerSampleConfiguration.java
@@ -1,8 +1,9 @@
 package com.wordnik.swagger.sample;
 
-import com.yammer.dropwizard.config.Configuration;
+import io.dropwizard.Configuration;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import org.hibernate.validator.constraints.NotEmpty;
 
 public class SwaggerSampleConfiguration extends Configuration {
diff --git a/samples/java-dropwizard/src/main/java/com/wordnik/swagger/sample/SwaggerSampleService.java b/samples/java-dropwizard/src/main/java/com/wordnik/swagger/sample/SwaggerSampleService.java
diff --git a/samples/java-jaxrs-cxf/pom.xml b/samples/java-jaxrs-cxf/pom.xml
diff --git a/samples/java-jaxrs/pom.xml b/samples/java-jaxrs/pom.xml
diff --git a/samples/java-jersey-jaxrs/pom.xml b/samples/java-jersey-jaxrs/pom.xml
