Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Finish bumping to yangtools 2.1.8
[netconf.git]
/
features
/
restconf
/
odl-restconf-common
/
pom.xml
diff --git
a/features/restconf/odl-restconf-common/pom.xml
b/features/restconf/odl-restconf-common/pom.xml
index 91cde29b44fabf23b242e965446b7af983a565e8..eb821522dfe7f6540c8d19a43159710f843ed225 100644
(file)
--- a/
features/restconf/odl-restconf-common/pom.xml
+++ b/
features/restconf/odl-restconf-common/pom.xml
@@
-6,21
+6,19
@@
terms of the Eclipse Public License v1.0 which accompanies this distribution,
and is available at http://www.eclipse.org/legal/epl-v10.html
-->
terms of the Eclipse Public License v1.0 which accompanies this distribution,
and is available at http://www.eclipse.org/legal/epl-v10.html
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>
3.0.2
</version>
+ <version>
4.0.9
</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>odl-restconf-common</artifactId>
<relativePath/>
</parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>odl-restconf-common</artifactId>
- <version>1.
8
.0-SNAPSHOT</version>
+ <version>1.
9
.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>OpenDaylight :: Restconf :: Common</name>
<packaging>feature</packaging>
<name>OpenDaylight :: Restconf :: Common</name>
@@
-30,42
+28,42
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
- <version>2.
0.2
</version>
+ <version>2.
1.8
</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
- <groupId>org.opendaylight.mdsal
.model
</groupId>
- <artifactId>mdsal-
model-
artifacts</artifactId>
- <version>
0.13.0-SNAPSHOT
</version>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-artifacts</artifactId>
+ <version>
3.0.6
</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-artifacts</artifactId>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>1.
8
.0-SNAPSHOT</version>
+ <version>1.
9
.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-artifacts</artifactId>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.aaa</groupId>
<artifactId>aaa-artifacts</artifactId>
- <version>0.
8
.0-SNAPSHOT</version>
+ <version>0.
9
.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-artifacts</artifactId>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-artifacts</artifactId>
- <version>1.
5
.0-SNAPSHOT</version>
+ <version>1.
6
.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>restconf-artifacts</artifactId>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>restconf-artifacts</artifactId>
- <version>1.
8
.0-SNAPSHOT</version>
+ <version>1.
9
.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<type>pom</type>
<scope>import</scope>
</dependency>
@@
-87,7
+85,7
@@
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal.model</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>odl-mdsal-model
s
</artifactId>
+ <artifactId>odl-mdsal-model
-rfc7895
</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<type>xml</type>
<classifier>features</classifier>
</dependency>
@@
-108,10
+106,6
@@
<groupId>org.opendaylight.netconf</groupId>
<artifactId>ietf-restconf</artifactId>
</dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>ietf-restconf</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>ietf-yang-library</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>ietf-restconf-monitoring</artifactId>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>ietf-restconf-monitoring</artifactId>
@@
-127,11
+121,9
@@
<!-- TODO: Remove this when RESTCONF is converted to GSON -->
<dependency>
<!-- TODO: Remove this when RESTCONF is converted to GSON -->
<dependency>
- <groupId>org.opendaylight.odlparent</groupId>
- <artifactId>odl-jackson-2.8</artifactId>
- <version>3.1.0</version>
- <type>xml</type>
- <classifier>features</classifier>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
</dependency>
</dependency>
+
</dependencies>
</project>
</dependencies>
</project>