Fixed build-failure because of undeclared transtive dependency. 70/16170/1
authorTony Tkacik <ttkacik@cisco.com>
Sun, 8 Mar 2015 13:26:20 +0000 (14:26 +0100)
committerTony Tkacik <ttkacik@cisco.com>
Sun, 8 Mar 2015 13:26:20 +0000 (14:26 +0100)
Change-Id: I1b11a861180437a2f317ee81d8699deaf3a741ba
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
opendaylight/md-sal/sal-rest-docgen-maven/pom.xml
opendaylight/md-sal/sal-rest-docgen-maven/src/main/java/org/opendaylight/controller/sal/rest/doc/maven/StaticDocGenerator.java

index 80e43d64023851410a4f458ffdfb0ae5149829d2..f5595727682878e2b583ca3d3137df455700f62e 100644 (file)
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-rest-docgen</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-maven-plugin-spi</artifactId>
index 280c26adb4331e93ce9c0fbc18d782f4264afdb2..0007bd45c1a770c15ecf4b8b4d0e60a249b16a20 100644 (file)
@@ -19,7 +19,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.ws.rs.core.UriInfo;
-import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
 import org.opendaylight.controller.sal.rest.doc.impl.ApiDocGenerator;
 import org.opendaylight.controller.sal.rest.doc.swagger.ApiDeclaration;
@@ -27,14 +26,15 @@ import org.opendaylight.controller.sal.rest.doc.swagger.Resource;
 import org.opendaylight.controller.sal.rest.doc.swagger.ResourceList;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang2sources.spi.CodeGenerator;
+import org.opendaylight.yangtools.yang2sources.spi.BasicCodeGenerator;
+import org.opendaylight.yangtools.yang2sources.spi.MavenProjectAware;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * This class gathers all yang defined {@link Module}s and generates Swagger compliant documentation.
  */
-public class StaticDocGenerator extends ApiDocGenerator implements CodeGenerator {
+public class StaticDocGenerator extends ApiDocGenerator implements BasicCodeGenerator, MavenProjectAware {
 
     private static final String DEFAULT_OUTPUT_BASE_DIR_PATH = "target" + File.separator + "generated-resources"
         + File.separator + "swagger-api-documentation";
@@ -127,10 +127,6 @@ public class StaticDocGenerator extends ApiDocGenerator implements CodeGenerator
         return super.createBasePathFromUriInfo(uriInfo);
     }
 
-    @Override
-    public void setLog(final Log log) {
-    }
-
     @Override
     public void setAdditionalConfig(final Map<String, String> additionalConfig) {
         this.additionalConfig = additionalConfig;