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 "Resolve Bug:445 Remove freemarker from config code generator."
[controller.git]
/
opendaylight
/
netconf
/
netconf-impl
/
pom.xml
diff --git
a/opendaylight/netconf/netconf-impl/pom.xml
b/opendaylight/netconf/netconf-impl/pom.xml
index b056f9be873feff65d2b731d66b6ef8fe0d8c4cd..4e78b2e4d640994ef12f1d8c5efe45b553496553 100644
(file)
--- a/
opendaylight/netconf/netconf-impl/pom.xml
+++ b/
opendaylight/netconf/netconf-impl/pom.xml
@@
-1,11
+1,10
@@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-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>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>netconf-impl</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>netconf-impl</artifactId>
@@
-36,6
+35,10
@@
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-util</artifactId>
</dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>config-util</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>protocol-framework</artifactId>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-mapping-api</artifactId>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-mapping-api</artifactId>
@@
-46,16
+49,6
@@
<artifactId>ietf-inet-types</artifactId>
</dependency>
<artifactId>ietf-inet-types</artifactId>
</dependency>
- <dependency>
- <groupId>org.opendaylight.bgpcep</groupId>
- <artifactId>util</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.opendaylight.bgpcep</groupId>
- <artifactId>framework</artifactId>
- </dependency>
-
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@
-70,10
+63,8
@@
</dependency>
<!-- test dependencies -->
<dependency>
</dependency>
<!-- test dependencies -->
<dependency>
- <groupId>org.opendaylight.
bgpcep
</groupId>
+ <groupId>org.opendaylight.
yangtools
</groupId>
<artifactId>mockito-configuration</artifactId>
<artifactId>mockito-configuration</artifactId>
- <version>${bgpcep.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@
-81,11
+72,6
@@
<scope>test</scope>
</dependency>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>yang-store-api</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
@@
-102,6
+88,13
@@
<artifactId>netconf-client</artifactId>
<scope>test</scope>
</dependency>
<artifactId>netconf-client</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>netconf-client</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.logback_settings</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>commons.logback_settings</artifactId>
@@
-146,7
+139,6
@@
org.w3c.dom,
org.xml.sax,
org.opendaylight.controller.netconf.util.messages,
org.w3c.dom,
org.xml.sax,
org.opendaylight.controller.netconf.util.messages,
- com.siemens.ct.exi.exceptions,
io.netty.util.internal,
org.opendaylight.controller.netconf.api.monitoring,
org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924,
io.netty.util.internal,
org.opendaylight.controller.netconf.api.monitoring,
org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924,
@@
-165,6
+157,14
@@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<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>
</plugins>
</build>
</plugin>
</plugins>
</build>