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 "Fix testtool on input modules without revision"
[netconf.git]
/
netconf
/
yanglib
/
pom.xml
diff --git
a/netconf/yanglib/pom.xml
b/netconf/yanglib/pom.xml
index 33e21b07f0aee478bb1b96cef04267e4fc022470..dcde35f1ccc39fda3d0545e0c60a55b6d2fec6f8 100644
(file)
--- a/
netconf/yanglib/pom.xml
+++ b/
netconf/yanglib/pom.xml
@@
-11,15
+11,15
@@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.opendaylight.
controller
</groupId>
- <artifactId>
config
-parent</artifactId>
- <version>
0.7
.0-SNAPSHOT</version>
- <relativePath
/
>
+ <groupId>org.opendaylight.
netconf
</groupId>
+ <artifactId>
netconf
-parent</artifactId>
+ <version>
1.6
.0-SNAPSHOT</version>
+ <relativePath
>../netconf-parent</relativePath
>
</parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>yanglib</artifactId>
</parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>yanglib</artifactId>
- <version>1.
3
.0-SNAPSHOT</version>
+ <version>1.
6
.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<build>
<packaging>bundle</packaging>
<build>
@@
-31,54
+31,30
@@
<configuration>
<instructions>
<Bundle-Name>YangLib</Bundle-Name>
<configuration>
<instructions>
<Bundle-Name>YangLib</Bundle-Name>
- <Import-Package>*,
- com.sun.jersey.spi.container.servlet, org.eclipse.jetty.servlets</Import-Package>
- <Web-ContextPath>/yanglib</Web-ContextPath>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>netconf-artifacts</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<dependencies>
<dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-config</artifactId>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-binding-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.opendaylight.
netcon
f</groupId>
- <artifactId>
ietf-netconf-yang-library
</artifactId>
+ <groupId>org.opendaylight.
mdsal.binding.model.iet
f</groupId>
+ <artifactId>
rfc7895
</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>jaxrs-api</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-parser-impl</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-parser-impl</artifactId>
@@
-92,18
+68,21
@@
<artifactId>yang-model-api</artifactId>
</dependency>
<dependency>
<artifactId>yang-model-api</artifactId>
</dependency>
<dependency>
- <groupId>org.
slf4j
</groupId>
- <artifactId>
slf4j
-api</artifactId>
+ <groupId>org.
opendaylight.aaa.web
</groupId>
+ <artifactId>
web
-api</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <scope>test</scope>
+ <groupId>org.opendaylight.aaa.web</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>
org.powermock
</groupId>
- <artifactId>
powermock-api-mockit
o</artifactId>
+ <groupId>
commons-io
</groupId>
+ <artifactId>
commons-i
o</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>