Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Refactor standard model placement
[netconf.git]
/
netconf
/
netconf-impl
/
pom.xml
diff --git
a/netconf/netconf-impl/pom.xml
b/netconf/netconf-impl/pom.xml
index a4ff368ca7215bacbed181196842c6859890167a..861258dc86c04d700609f7e262a192179bb97336 100644
(file)
--- a/
netconf/netconf-impl/pom.xml
+++ b/
netconf/netconf-impl/pom.xml
@@
-10,34
+10,20
@@
<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>
4.0
.0-SNAPSHOT</version>
+ <relativePath
>../../parent</relativePath
>
</parent>
</parent>
- <groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-impl</artifactId>
<artifactId>netconf-impl</artifactId>
- <version>1.2.0-SNAPSHOT</version>
<name>${project.artifactId}</name>
<packaging>bundle</packaging>
<name>${project.artifactId}</name>
<packaging>bundle</packaging>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>netconf-subsystem</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<dependencies>
<dependency>
- <groupId>
${project.groupId}
</groupId>
- <artifactId>
ietf-netconf-monitoring
</artifactId>
+ <groupId>
org.opendaylight.netconf.model
</groupId>
+ <artifactId>
rfc6022
</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@
-56,10
+42,6
@@
<groupId>${project.groupId}</groupId>
<artifactId>netconf-notifications-api</artifactId>
</dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-notifications-api</artifactId>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>netconf-notifications-impl</artifactId>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-netty-util</artifactId>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-netty-util</artifactId>
@@
-72,14
+54,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
+64,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,8
+87,8
@@
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
+ <groupId>
org.
xmlunit</groupId>
+ <artifactId>xmlunit
-legacy
</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<scope>test</scope>
</dependency>
</dependencies>
@@
-136,20
+100,27
@@
<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>
</plugin>
<plugin>
<Export-Package>org.opendaylight.netconf.impl.*</Export-Package>
</instructions>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
- <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar-no-fork</goal>
+ </goals>
</execution>
</executions>
</plugin>
</execution>
</executions>
</plugin>