Removing the explicitly mentioned swagger version, because they are n…

…ow driven by dependency mgmnt in hawkular-parent. Removing unused class (forgotten because of previous merge-conflicts), some other minor fixes
hawkular · Mar 25, 2015 · 872cabb · 872cabb
1 parent 73357a6
commit 872cabb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 234 deletions.
diff --git a/hawkular-alerts-rest/pom.xml b/hawkular-alerts-rest/pom.xml
@@ -83,13 +83,12 @@
     <dependency>
       <groupId>com.wordnik</groupId>
       <artifactId>swagger-annotations</artifactId>
-      <version>${version.com.swagger}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.wordnik</groupId>
       <artifactId>swagger-core_2.10</artifactId>
-      <version>${version.com.swagger}</version>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -152,18 +151,17 @@
           <plugin>
             <groupId>com.github.kongchen</groupId>
             <artifactId>swagger-maven-plugin</artifactId>
-            <version>2.3.3</version>
             <configuration>
               <apiSources>
                 <apiSource>
                   <locations>org.hawkular.alerts.rest</locations>
                   <apiVersion>1.0</apiVersion>
                   <basePath>http://localhost:8080/hawkular/alerts</basePath>
                   <outputTemplate>${basedir}/src/main/resources/rest-doc/asciidoc.mustache</outputTemplate>
-                  <swaggerDirectory>${build.directory}/generated/swagger-ui</swaggerDirectory>
+                  <swaggerDirectory>${project.build.directory}/generated/swagger-ui</swaggerDirectory>
                   <swaggerInternalFilter>org.hawkular.alerts.rest.swagger.filter.JaxRsFilter</swaggerInternalFilter>
                   <swaggerApiReader>com.wordnik.swagger.jaxrs.reader.DefaultJaxrsApiReader</swaggerApiReader>
-                  <outputPath>${build.directory}/generated/rest-alerts.adoc</outputPath>
+                  <outputPath>${project.build.directory}/generated/rest-alerts.adoc</outputPath>
                 </apiSource>
               </apiSources>
             </configuration>

diff --git a/hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/DampeningHandler.java b/hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/DampeningHandler.java
diff --git a/hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java b/hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/TriggersHandler.java
@@ -81,7 +81,7 @@ public TriggersHandler() {
     @Path("/")
     @Produces(APPLICATION_JSON)
     @ApiOperation(value = "Find all triggers definitions",
-                  responseContainer = "Collection",
+                  responseContainer = "Collection<Trigger>",
                   response = Trigger.class,
                   notes = "Pagination is not yet implemented")
     public void findAllTriggers(@Suspended final AsyncResponse response) {

diff --git a/pom.xml b/pom.xml
@@ -89,7 +89,6 @@
     <version.com.google.code.gson>2.2.4</version.com.google.code.gson>
     <version.com.google.guava>16.0.1</version.com.google.guava>
     <version.com.h2database>1.4.185</version.com.h2database>
-    <version.com.swagger>1.3.12</version.com.swagger>
     <version.javaee.spec>7.0</version.javaee.spec>
     <version.junit>4.12</version.junit>
     <version.org.apache.activemq>5.10.0</version.org.apache.activemq>