Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Delete restconf
[controller.git]
/
opendaylight
/
archetypes
/
opendaylight-startup
/
src
/
main
/
resources
/
archetype-resources
/
features
/
pom.xml
diff --git
a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
index c5adb28db745ce6c676f21ccf3f10c4edd43f933..3f1abbc13657b4102635cdf5ca5296bef748b9dc 100644
(file)
--- a/
opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
+++ b/
opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
@@
-12,7
+12,7
@@
and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>features-parent</artifactId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>features-parent</artifactId>
- <version>1.
5
.0-SNAPSHOT</version>
+ <version>1.
6
.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>${groupId}</groupId>
<relativePath/>
</parent>
<groupId>${groupId}</groupId>
@@
-24,8
+24,9
@@
and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
<maven>3.1.1</maven>
</prerequisites>
<properties>
<maven>3.1.1</maven>
</prerequisites>
<properties>
- <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
- <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+ <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+ <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
+ <dlux.version>0.3.0-SNAPSHOT</dlux.version>
<configfile.directory>etc/opendaylight/karaf</configfile.directory>
</properties>
<dependencyManagement>
<configfile.directory>etc/opendaylight/karaf</configfile.directory>
</properties>
<dependencyManagement>
@@
-65,11
+66,26
@@
and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
<type>xml</type>
<scope>runtime</scope>
</dependency>
<type>xml</type>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.dlux</groupId>
+ <artifactId>features-dlux</artifactId>
+ <classifier>features</classifier>
+ <version>${dlux.version}</version>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>${symbol_dollar}{project.groupId}</groupId>
<artifactId>${artifactId}-impl</artifactId>
<version>${symbol_dollar}{project.version}</version>
</dependency>
<dependency>
<groupId>${symbol_dollar}{project.groupId}</groupId>
<artifactId>${artifactId}-impl</artifactId>
<version>${symbol_dollar}{project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${symbol_dollar}{project.groupId}</groupId>
+ <artifactId>${artifactId}-impl</artifactId>
+ <version>${symbol_dollar}{project.version}</version>
+ <type>xml</type>
+ <classifier>config</classifier>
+ </dependency>
<dependency>
<groupId>${symbol_dollar}{project.groupId}</groupId>
<artifactId>${artifactId}-api</artifactId>
<dependency>
<groupId>${symbol_dollar}{project.groupId}</groupId>
<artifactId>${artifactId}-api</artifactId>