Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "In case of an error event, cleanup the config too"
[controller.git]
/
opendaylight
/
forwardingrulesmanager
/
implementation
/
pom.xml
diff --git
a/opendaylight/forwardingrulesmanager/implementation/pom.xml
b/opendaylight/forwardingrulesmanager/implementation/pom.xml
index 1dd2c0580bce3871ce5da0d2e39f5f98ffd46733..e7faf735841441c67112042106c9b1eb6b13cfc4 100644
(file)
--- a/
opendaylight/forwardingrulesmanager/implementation/pom.xml
+++ b/
opendaylight/forwardingrulesmanager/implementation/pom.xml
@@
-9,6
+9,11
@@
<version>1.4.0-SNAPSHOT</version>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
<version>1.4.0-SNAPSHOT</version>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
+ <scm>
+ <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+ <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+ <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+ </scm>
<artifactId>forwardingrulesmanager.implementation</artifactId>
<version>0.4.0-SNAPSHOT</version>
<artifactId>forwardingrulesmanager.implementation</artifactId>
<version>0.4.0-SNAPSHOT</version>
@@
-28,7
+33,7
@@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>
0.5.3.201107060350
</version>
+ <version>
${jacoco.version}
</version>
</plugin>
</plugins>
</pluginManagement>
</plugin>
</plugins>
</pluginManagement>
@@
-36,13
+41,14
@@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>
2.3.6
</version>
+ <version>
${bundle.plugin.version}
</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Include-Resource>
</Include-Resource>
<Export-Package>
<extensions>true</extensions>
<configuration>
<instructions>
<Include-Resource>
</Include-Resource>
<Export-Package>
+ org.opendaylight.controller.forwardingrulesmanager.implementation.data
</Export-Package>
<Import-Package>
org.opendaylight.controller.clustering.services,
</Export-Package>
<Import-Package>
org.opendaylight.controller.clustering.services,
@@
-56,7
+62,9
@@
org.opendaylight.controller.sal.match,
org.opendaylight.controller.sal.utils,
org.opendaylight.controller.sal.packet,
org.opendaylight.controller.sal.match,
org.opendaylight.controller.sal.utils,
org.opendaylight.controller.sal.packet,
+ org.opendaylight.controller.sal.connection,
org.opendaylight.controller.forwardingrulesmanager,
org.opendaylight.controller.forwardingrulesmanager,
+ org.opendaylight.controller.connectionmanager,
javax.xml.bind.annotation,
javax.xml.bind,
org.apache.felix.dm,
javax.xml.bind.annotation,
javax.xml.bind,
org.apache.felix.dm,
@@
-75,6
+83,7
@@
<Service-Component>
</Service-Component>
</instructions>
<Service-Component>
</Service-Component>
</instructions>
+ <manifestLocation>${project.basedir}/META-INF</manifestLocation>
</configuration>
</plugin>
<plugin>
</configuration>
</plugin>
<plugin>
@@
-120,13
+129,18
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>switchmanager</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>switchmanager</artifactId>
- <version>0.
4
.0-SNAPSHOT</version>
+ <version>0.
5
.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
<version>0.5.0-SNAPSHOT</version>
</dependency>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal</artifactId>
<version>0.5.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>sal.connection</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>forwardingrulesmanager</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>forwardingrulesmanager</artifactId>
@@
-138,5
+152,10
@@
<version>4.8.1</version>
<scope>test</scope>
</dependency>
<version>4.8.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>connectionmanager</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
</dependencies>
</project>