Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge changes I0d93e3c4,I34aca892,I74162d9a,Icd48e366
[netconf.git]
/
restconf
/
sal-rest-docgen
/
pom.xml
diff --git
a/restconf/sal-rest-docgen/pom.xml
b/restconf/sal-rest-docgen/pom.xml
index d36a7d6ab95c0742138c1f067c76377df73244b5..155351e36b62298d6afce6f0df7fc4a4a8b5e0da 100644
(file)
--- a/
restconf/sal-rest-docgen/pom.xml
+++ b/
restconf/sal-rest-docgen/pom.xml
@@
-11,13
+11,13
@@
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
- <version>1.
8.0-SNAPSHOT
</version>
+ <version>1.
9.0
</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>sal-rest-docgen</artifactId>
<relativePath/>
</parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>sal-rest-docgen</artifactId>
- <version>1.
5
.0-SNAPSHOT</version>
+ <version>1.
6
.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencyManagement>
<packaging>bundle</packaging>
<dependencyManagement>
@@
-25,7
+25,7
@@
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-parent</artifactId>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-parent</artifactId>
- <version>1.
2
.0-SNAPSHOT</version>
+ <version>1.
3
.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<type>pom</type>
<scope>import</scope>
</dependency>
@@
-46,10
+46,6
@@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-json-org</artifactId>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<dependency>
<groupId>com.google.guava</groupId>
@@
-62,11
+58,6
@@
<artifactId>jaxrs-api</artifactId>
</dependency>
<artifactId>jaxrs-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- </dependency>
-
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-core-api</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-core-api</artifactId>
@@
-108,7
+99,7
@@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-
all
</artifactId>
+ <artifactId>mockito-
core
</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
@@
-133,9
+124,8
@@
<instructions>
<Bundle-Name>MD SAL Rest Api Doc Generator</Bundle-Name>
<Embed-Dependency>generex, automaton</Embed-Dependency>
<instructions>
<Bundle-Name>MD SAL Rest Api Doc Generator</Bundle-Name>
<Embed-Dependency>generex, automaton</Embed-Dependency>
- <Import-Package>!org.apache.maven.plugin.logging,
- !org.apache.maven.project,
- !org.opendaylight.yangtools.yang2sources.spi,
+ <!-- needed for web.xml. Remove once we have Jersey 2 -->
+ <Import-Package>
*,
com.sun.jersey.spi.container.servlet,
org.eclipse.jetty.servlets,
*,
com.sun.jersey.spi.container.servlet,
org.eclipse.jetty.servlets,
@@
-145,8
+135,7
@@
org.apache.shiro.web.env
</Import-Package>
<Export-Package>
org.apache.shiro.web.env
</Import-Package>
<Export-Package>
- com.fasterxml.jackson.datatype.*,
- org.json
+ com.fasterxml.jackson.datatype.*
</Export-Package>
<Bundle-Activator>org.opendaylight.netconf.sal.rest.doc.DocProvider</Bundle-Activator>
<Web-ContextPath>/apidoc</Web-ContextPath>
</Export-Package>
<Bundle-Activator>org.opendaylight.netconf.sal.rest.doc.DocProvider</Bundle-Activator>
<Web-ContextPath>/apidoc</Web-ContextPath>
@@
-154,6
+143,13
@@
</configuration>
</plugin>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+ </configuration>
+ </plugin>
</plugins>
</build>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>