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 "Bug 618 - convert xtend to java in md-sal/inventory-manager"
[controller.git]
/
opendaylight
/
distribution
/
sanitytest
/
pom.xml
diff --git
a/opendaylight/distribution/sanitytest/pom.xml
b/opendaylight/distribution/sanitytest/pom.xml
index a0001f6db50735d1d69e131db9023817211f5c85..893776c567b03c37e1fe7bb94f0e4f879484e417 100644
(file)
--- a/
opendaylight/distribution/sanitytest/pom.xml
+++ b/
opendaylight/distribution/sanitytest/pom.xml
@@
-4,20
+4,20
@@
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
<parent>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.opendaylight</artifactId>
- <version>1.4.
1
-SNAPSHOT</version>
+ <version>1.4.
2
-SNAPSHOT</version>
<relativePath>../../commons/opendaylight</relativePath>
</parent>
<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>
- <tag>HEAD</tag>
- </scm>
<artifactId>sanitytest</artifactId>
<artifactId>sanitytest</artifactId>
- <version>0.4.
1
-SNAPSHOT</version>
+ <version>0.4.
2
-SNAPSHOT</version>
<packaging>bundle</packaging>
<packaging>bundle</packaging>
-
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
<build>
<plugins>
<plugin>
@@
-27,25
+27,26
@@
<extensions>true</extensions>
<configuration>
<instructions>
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.opendaylight.controller.sanitytest
- </Export-Package>
- <Import-Package>
- javax.xml.bind.annotation,
+ <Export-Package>org.opendaylight.controller.sanitytest</Export-Package>
+ <Import-Package>javax.xml.bind.annotation,
org.osgi.service.component,
org.slf4j,
org.eclipse.osgi.framework.console,
org.osgi.framework,
org.eclipse.osgi.baseadaptor,
org.osgi.service.component,
org.slf4j,
org.eclipse.osgi.framework.console,
org.osgi.framework,
org.eclipse.osgi.baseadaptor,
- org.eclipse.osgi.framework.adaptor
- </Import-Package>
- <Bundle-Activator>
- org.opendaylight.controller.sanitytest.internal.Activator
- </Bundle-Activator>
+ org.eclipse.osgi.framework.adaptor,
+ org.osgi.framework.wiring</Import-Package>
+ <Bundle-Activator>org.opendaylight.controller.sanitytest.internal.Activator</Bundle-Activator>
</instructions>
<manifestLocation>${project.basedir}/META-INF</manifestLocation>
</configuration>
</plugin>
</plugins>
</build>
</instructions>
<manifestLocation>${project.basedir}/META-INF</manifestLocation>
</configuration>
</plugin>
</plugins>
</build>
+ <scm>
+ <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+ <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+ <tag>HEAD</tag>
+ <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+ </scm>
</project>
</project>