Code Review
/
openflowplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove forwarding-rules manager config yang and XML
[openflowplugin.git]
/
features-li
/
pom.xml
diff --git
a/features-li/pom.xml
b/features-li/pom.xml
index 2343d68aad23faf5f4f1981f1721167944f75aff..d1799c864b7e72f930176b2bfad6651046509337 100644
(file)
--- a/
features-li/pom.xml
+++ b/
features-li/pom.xml
@@
-24,7
+24,6
@@
<lldp.version>0.11.0-SNAPSHOT</lldp.version>
<config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
<lldp.version>0.11.0-SNAPSHOT</lldp.version>
<config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
- <config.statistics.manager.configfile>30-statistics-manager.xml</config.statistics.manager.configfile>
<restconf.version>1.4.0-SNAPSHOT</restconf.version>
<mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
</properties>
<restconf.version>1.4.0-SNAPSHOT</restconf.version>
<mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
</properties>
@@
-149,9
+148,7
@@
</dependency>
<dependency>
<groupId>org.opendaylight.openflowplugin.applications</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.openflowplugin.applications</groupId>
- <artifactId>forwardingrules-manager-config</artifactId>
- <classifier>config</classifier>
- <type>xml</type>
+ <artifactId>forwardingrules-sync</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.openflowplugin.applications</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.openflowplugin.applications</groupId>
@@
-171,6
+168,11
@@
<classifier>config</classifier>
<type>xml</type>
</dependency>
<classifier>config</classifier>
<type>xml</type>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.openflowplugin</groupId>
+ <artifactId>openflowplugin-blueprint-config</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.opendaylight.dlux</groupId>
<dependency>
<groupId>org.opendaylight.dlux</groupId>
@@
-252,12
+254,6
@@
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>drop-test-karaf</artifactId>
</dependency>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>drop-test-karaf</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.openflowplugin</groupId>
- <artifactId>drop-test-karaf</artifactId>
- <classifier>config</classifier>
- <type>xml</type>
- </dependency>
<dependency>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>test-common</artifactId>
<dependency>
<groupId>org.opendaylight.openflowplugin</groupId>
<artifactId>test-common</artifactId>