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 "Exception for URI /restconf/operations/module_name:rpc ended with slash"
[controller.git]
/
opendaylight
/
netconf
/
netconf-ssh
/
pom.xml
diff --git
a/opendaylight/netconf/netconf-ssh/pom.xml
b/opendaylight/netconf/netconf-ssh/pom.xml
index f60b4b02f5edb571c15313139ce32895fb4843a8..73e0a467c040cc3cc8e7f3518e2a209ebdddb453 100644
(file)
--- a/
opendaylight/netconf/netconf-ssh/pom.xml
+++ b/
opendaylight/netconf/netconf-ssh/pom.xml
@@
-1,9
+1,8
@@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>netconf-subsystem</artifactId>
<groupId>org.opendaylight.controller</groupId>
<parent>
<artifactId>netconf-subsystem</artifactId>
<groupId>org.opendaylight.controller</groupId>
- <version>0.2.
3
-SNAPSHOT</version>
+ <version>0.2.
5
-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@
-33,31
+32,45
@@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>usermanager</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
</dependencies>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Bundle-Activator>org.opendaylight.controller.netconf.osgi.NetconfSSHActivator</Bundle-Activator>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Bundle-Activator>org.opendaylight.controller.netconf.osgi.NetconfSSHActivator</Bundle-Activator>
- <Export-Package>
- org.opendaylight.controller.netconf.ssh,
- </Export-Package>
<Import-Package>
com.google.common.base,
ch.ethz.ssh2,
ch.ethz.ssh2.signature,
<Import-Package>
com.google.common.base,
ch.ethz.ssh2,
ch.ethz.ssh2.signature,
- java.net,
- javax.annotation,
org.apache.commons.io,
org.apache.commons.io,
- org.opendaylight.controller.netconf.util,
org.opendaylight.controller.netconf.util.osgi,
org.opendaylight.controller.netconf.util.osgi,
- org.opendaylight.protocol.framework,
+ org.opendaylight.controller.usermanager,
+ org.opendaylight.controller.sal.authorization,
+ org.opendaylight.controller.sal.utils,
org.osgi.framework,
org.osgi.framework,
- org.slf4j
+ org.osgi.util.tracker,
+ org.slf4j,
</Import-Package>
</instructions>
</configuration>
</Import-Package>
</instructions>
</configuration>