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 "Fixed bug of IPv4 option handling."
[controller.git]
/
opendaylight
/
sal
/
implementation
/
pom.xml
diff --git
a/opendaylight/sal/implementation/pom.xml
b/opendaylight/sal/implementation/pom.xml
index 57ccc4a9d7df6c8b39db1bebe741556b99e454ad..3eb2379a78fa51f1984256875c532bebf166f482 100644
(file)
--- a/
opendaylight/sal/implementation/pom.xml
+++ b/
opendaylight/sal/implementation/pom.xml
@@
-8,7
+8,6
@@
<relativePath>../../commons/opendaylight</relativePath>
\r
</parent>
\r
\r
<relativePath>../../commons/opendaylight</relativePath>
\r
</parent>
\r
\r
- <groupId>org.opendaylight.controller</groupId>
\r
<artifactId>sal.implementation</artifactId>
\r
<version>0.4.0-SNAPSHOT</version>
\r
<packaging>bundle</packaging>
\r
<artifactId>sal.implementation</artifactId>
\r
<version>0.4.0-SNAPSHOT</version>
\r
<packaging>bundle</packaging>
\r
@@
-36,14
+35,15
@@
org.opendaylight.controller.sal.utils,
\r
org.apache.felix.dm,
\r
org.eclipse.osgi.framework.console,
\r
org.opendaylight.controller.sal.utils,
\r
org.apache.felix.dm,
\r
org.eclipse.osgi.framework.console,
\r
-
org.osgi.framework
\r
+ org.osgi.framework
\r
</Import-Package>
\r
<Export-Package>
\r
</Export-Package>
\r
</Import-Package>
\r
<Export-Package>
\r
</Export-Package>
\r
-
<Bundle-Activator>
\r
- org.opendaylight.controller.sal.implementation.internal.Activator
\r
-
</Bundle-Activator>
\r
+ <Bundle-Activator>
\r
+
org.opendaylight.controller.sal.implementation.internal.Activator
\r
+ </Bundle-Activator>
\r
</instructions>
\r
</instructions>
\r
+ <manifestLocation>${project.basedir}/META-INF</manifestLocation>
\r
</configuration>
\r
</plugin>
\r
</plugins>
\r
</configuration>
\r
</plugin>
\r
</plugins>
\r