Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG 2335 : Add jolokia feature"
[controller.git]
/
opendaylight
/
md-sal
/
sal-rest-docgen
/
pom.xml
diff --git
a/opendaylight/md-sal/sal-rest-docgen/pom.xml
b/opendaylight/md-sal/sal-rest-docgen/pom.xml
index 0c8b4d5a2ada924025aa40ff805d9c4613606e66..53f1b2e69274465a01dc6d34000eafe446b3bdb0 100644
(file)
--- a/
opendaylight/md-sal/sal-rest-docgen/pom.xml
+++ b/
opendaylight/md-sal/sal-rest-docgen/pom.xml
@@
-4,16
+4,12
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-parent</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-parent</artifactId>
- <version>1.
1
-SNAPSHOT</version>
+ <version>1.
2.0
-SNAPSHOT</version>
</parent>
<artifactId>sal-rest-docgen</artifactId>
<packaging>bundle</packaging>
</parent>
<artifactId>sal-rest-docgen</artifactId>
<packaging>bundle</packaging>
- <properties>
- <jaxrs-api.version>3.0.4.Final</jaxrs-api.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@
-42,7
+38,6
@@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
- <version>${jaxrs-api.version}</version>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-77,6
+72,11
@@
<artifactId>yang-parser-impl</artifactId>
</dependency>
<artifactId>yang-parser-impl</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-maven-plugin-spi</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@
-96,6
+96,10
@@
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-data-api</artifactId>
+ </dependency>
</dependencies>
<build>
</dependencies>
<build>
@@
-108,8
+112,12
@@
<instructions>
<Bundle-Name>MD SAL Rest Api Doc Generator</Bundle-Name>
<instructions>
<Bundle-Name>MD SAL Rest Api Doc Generator</Bundle-Name>
- <Import-Package>*,
- com.sun.jersey.spi.container.servlet</Import-Package>
+ <Import-Package>!org.apache.maven.plugin.logging,
+ !org.apache.maven.project,
+ !org.opendaylight.yangtools.yang2sources.spi,
+ *,
+ com.sun.jersey.spi.container.servlet, org.eclipse.jetty.servlets
+ </Import-Package>
<Bundle-Activator>org.opendaylight.controller.sal.rest.doc.DocProvider</Bundle-Activator>
<Web-ContextPath>/apidoc</Web-ContextPath>
</instructions>
<Bundle-Activator>org.opendaylight.controller.sal.rest.doc.DocProvider</Bundle-Activator>
<Web-ContextPath>/apidoc</Web-ContextPath>
</instructions>