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 "Address @XmlSeeAlso limitation. Provide the ability to inject the JAXB types...
[controller.git]
/
opendaylight
/
northbound
/
commons
/
pom.xml
diff --git
a/opendaylight/northbound/commons/pom.xml
b/opendaylight/northbound/commons/pom.xml
index d80d669edf9bc161982569c1a39a45fda7215144..692b17a9a6c5409bdb38d1e729b504a5177a4f27 100644
(file)
--- a/
opendaylight/northbound/commons/pom.xml
+++ b/
opendaylight/northbound/commons/pom.xml
@@
-7,8
+7,12
@@
<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>
- <groupId>org.opendaylight.controller</groupId>
<artifactId>commons.northbound</artifactId>
<version>0.4.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<artifactId>commons.northbound</artifactId>
<version>0.4.0-SNAPSHOT</version>
<packaging>bundle</packaging>
@@
-24,17
+28,31
@@
<instructions>
<Export-Package>
org.opendaylight.controller.northbound.commons.exception,
<instructions>
<Export-Package>
org.opendaylight.controller.northbound.commons.exception,
+ org.opendaylight.controller.northbound.commons.types,
+ org.opendaylight.controller.northbound.commons.utils,
org.opendaylight.controller.northbound.commons
</Export-Package>
<Import-Package>
javax.ws.rs,
org.opendaylight.controller.northbound.commons
</Export-Package>
<Import-Package>
javax.ws.rs,
+ javax.ws.rs.ext,
javax.ws.rs.core,
javax.ws.rs.core,
+ javax.xml.bind,
+ javax.xml.bind.annotation,
+ org.objectweb.asm,
org.opendaylight.controller.sal.utils,
org.opendaylight.controller.sal.utils,
+ org.opendaylight.controller.sal.authorization,
+ org.opendaylight.controller.containermanager,
org.opendaylight.controller.usermanager,
org.opendaylight.controller.usermanager,
- javax.servlet.http,
- org.slf4j,
+ org.opendaylight.controller.northbound.bundlescanner,
+ org.osgi.framework,
+ org.osgi.service.packageadmin,
+ org.osgi.util.tracker,
+ javax.servlet.http,
+ org.codehaus.jackson.jaxrs,
+ org.slf4j
</Import-Package>
</instructions>
</Import-Package>
</instructions>
+ <manifestLocation>${project.basedir}/META-INF</manifestLocation>
</configuration>
</plugin>
</plugins>
</configuration>
</plugin>
</plugins>
@@
-50,5
+68,10
@@
<artifactId>usermanager</artifactId>
<version>0.4.0-SNAPSHOT</version>
</dependency>
<artifactId>usermanager</artifactId>
<version>0.4.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>bundlescanner</artifactId>
+ <version>0.4.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
</dependencies>
</project>