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 "Fix bulk sync in SwitchMananger."
[controller.git]
/
opendaylight
/
protocol_plugins
/
openflow
/
pom.xml
diff --git
a/opendaylight/protocol_plugins/openflow/pom.xml
b/opendaylight/protocol_plugins/openflow/pom.xml
index 23c0d9d90e3ff9b0fe3bb48713d45a6201c7a299..9d84d45967a44114a960dfc4ab3cd56f671e2dfd 100644
(file)
--- a/
opendaylight/protocol_plugins/openflow/pom.xml
+++ b/
opendaylight/protocol_plugins/openflow/pom.xml
@@
-8,7
+8,6
@@
<relativePath>../../commons/opendaylight</relativePath>
</parent>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
- <groupId>org.opendaylight.controller</groupId>
<artifactId>protocol_plugins.openflow</artifactId>
<version>0.4.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<artifactId>protocol_plugins.openflow</artifactId>
<version>0.4.0-SNAPSHOT</version>
<packaging>bundle</packaging>
@@
-38,11
+37,11
@@
org.apache.felix.dm,
org.slf4j,
org.eclipse.osgi.framework.console,
org.apache.felix.dm,
org.slf4j,
org.eclipse.osgi.framework.console,
-
org.osgi.framework,
-
javax.net.ssl
+ org.osgi.framework,
+ javax.net.ssl
</Import-Package>
<Export-Package>
</Import-Package>
<Export-Package>
-
org.opendaylight.controller.protocol_plugin.openflow.internal
+ org.opendaylight.controller.protocol_plugin.openflow.internal
</Export-Package>
<Embed-Dependency>
org.openflow.openflowj
</Export-Package>
<Embed-Dependency>
org.openflow.openflowj
@@
-54,6
+53,7
@@
org.opendaylight.controller.protocol_plugin.openflow.internal.Activator
</Bundle-Activator>
</instructions>
org.opendaylight.controller.protocol_plugin.openflow.internal.Activator
</Bundle-Activator>
</instructions>
+ <manifestLocation>${project.basedir}/META-INF</manifestLocation>
</configuration>
</plugin>
</plugins>
</configuration>
</plugin>
</plugins>