Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Do not start netconf-impl for css netconf endpoint
[netconf.git]
/
netconf
/
netconf-impl
/
pom.xml
diff --git
a/netconf/netconf-impl/pom.xml
b/netconf/netconf-impl/pom.xml
index c78eb147a937f2a6aa6eae4c7eb8f57196e6de27..2ebd6713b8d8264e3229dcd35045a42e0236bdc0 100644
(file)
--- a/
netconf/netconf-impl/pom.xml
+++ b/
netconf/netconf-impl/pom.xml
@@
-10,24
+10,24
@@
<modelVersion>4.0.0</modelVersion>
<parent>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.opendaylight.
controller
</groupId>
- <artifactId>
config
-parent</artifactId>
- <version>
0
.6.0-SNAPSHOT</version>
- <relativePath
/
>
+ <groupId>org.opendaylight.
netconf
</groupId>
+ <artifactId>
netconf
-parent</artifactId>
+ <version>
1
.6.0-SNAPSHOT</version>
+ <relativePath
>../netconf-parent</relativePath
>
</parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-impl</artifactId>
</parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-impl</artifactId>
- <version>1.
2
.0-SNAPSHOT</version>
+ <version>1.
6
.0-SNAPSHOT</version>
<name>${project.artifactId}</name>
<packaging>bundle</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<name>${project.artifactId}</name>
<packaging>bundle</packaging>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.opendaylight.
netconf
</groupId>
- <artifactId>
netconf-subsystem
</artifactId>
- <version>
${project.version}
</version>
+ <groupId>org.opendaylight.
controller
</groupId>
+ <artifactId>
config-artifacts
</artifactId>
+ <version>
0.10.0-SNAPSHOT
</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<type>pom</type>
<scope>import</scope>
</dependency>
@@
-72,14
+72,6
@@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>config-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>protocol-framework</artifactId>
- </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>threadpool-config-api</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>threadpool-config-api</artifactId>
@@
-90,20
+82,10
@@
<artifactId>mockito-configuration</artifactId>
</dependency>
<artifactId>mockito-configuration</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-inet-types-2013-07-15</artifactId>
- </dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-client</artifactId>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-client</artifactId>
@@
-123,14
+105,10
@@
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
+ <groupId>
org.
xmlunit</groupId>
+ <artifactId>xmlunit
-legacy
</artifactId>
<scope>test</scope>
</dependency>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
</dependencies>
<build>
</dependencies>
<build>
@@
-140,7
+118,6
@@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-Activator>org.opendaylight.netconf.impl.osgi.NetconfImplActivator</Bundle-Activator>
<Export-Package>org.opendaylight.netconf.impl.*</Export-Package>
</instructions>
</configuration>
<Export-Package>org.opendaylight.netconf.impl.*</Export-Package>
</instructions>
</configuration>