Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove sal-dom-config dependency
[netconf.git]
/
karaf
/
pom.xml
diff --git
a/karaf/pom.xml
b/karaf/pom.xml
index 3ab1d1478ed79c3ee70520c4ee63ccca9f651666..1fecd96e1ab884bac850c2290d89c99ed9b53ca3 100644
(file)
--- a/
karaf/pom.xml
+++ b/
karaf/pom.xml
@@
-11,19
+11,16
@@
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>karaf4-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>karaf4-parent</artifactId>
- <version>
1.9
.0</version>
+ <version>
3.1
.0</version>
<relativePath/>
</parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-karaf</artifactId>
<relativePath/>
</parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-karaf</artifactId>
- <version>1.
6
.0-SNAPSHOT</version>
+ <version>1.
8
.0-SNAPSHOT</version>
<packaging>pom</packaging>
<packaging>pom</packaging>
- <prerequisites>
- <maven>3.1.1</maven>
- </prerequisites>
<properties>
<properties>
- <netconf.version>1.
3
.0-SNAPSHOT</netconf.version>
- <restconf.version>1.
6
.0-SNAPSHOT</restconf.version>
+ <netconf.version>1.
5
.0-SNAPSHOT</netconf.version>
+ <restconf.version>1.
8
.0-SNAPSHOT</restconf.version>
</properties>
<dependencies>
</properties>
<dependencies>
@@
-36,7
+33,7
@@
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
- <artifactId>features
4
-netconf</artifactId>
+ <artifactId>features-netconf</artifactId>
<version>${netconf.version}</version>
<classifier>features</classifier>
<type>xml</type>
<version>${netconf.version}</version>
<classifier>features</classifier>
<type>xml</type>
@@
-44,7
+41,7
@@
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
- <artifactId>features
4
-netconf-connector</artifactId>
+ <artifactId>features-netconf-connector</artifactId>
<version>${netconf.version}</version>
<classifier>features</classifier>
<type>xml</type>
<version>${netconf.version}</version>
<classifier>features</classifier>
<type>xml</type>
@@
-52,7
+49,7
@@
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
- <artifactId>features
4
-restconf</artifactId>
+ <artifactId>features-restconf</artifactId>
<version>${restconf.version}</version>
<classifier>features</classifier>
<type>xml</type>
<version>${restconf.version}</version>
<classifier>features</classifier>
<type>xml</type>
@@
-60,7
+57,7
@@
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
- <artifactId>features
4
-yanglib</artifactId>
+ <artifactId>features-yanglib</artifactId>
<version>${netconf.version}</version>
<classifier>features</classifier>
<type>xml</type>
<version>${netconf.version}</version>
<classifier>features</classifier>
<type>xml</type>