Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump upstream versions
[netconf.git]
/
netconf
/
tools
/
netconf-testtool
/
pom.xml
diff --git
a/netconf/tools/netconf-testtool/pom.xml
b/netconf/tools/netconf-testtool/pom.xml
index a2ea516d17f39fa980ede76ede9d96c155929a31..36ae46df4aa562cbe19d3e24c9d1d7edcb7db4fd 100644
(file)
--- a/
netconf/tools/netconf-testtool/pom.xml
+++ b/
netconf/tools/netconf-testtool/pom.xml
@@
-14,60
+14,40
@@
<parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-parent</artifactId>
<parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-parent</artifactId>
- <version>
1.5
.0-SNAPSHOT</version>
- <relativePath>../../
netconf-
parent</relativePath>
+ <version>
4.0
.0-SNAPSHOT</version>
+ <relativePath>../../
../
parent</relativePath>
</parent>
</parent>
- <groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-testtool</artifactId>
<name>${project.artifactId}</name>
<artifactId>netconf-testtool</artifactId>
<name>${project.artifactId}</name>
- <version>1.5.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<sonar.skip>true</sonar.skip>
</properties>
<packaging>jar</packaging>
<properties>
<sonar.skip>true</sonar.skip>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>config-artifacts</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<dependencies>
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
- <version>
2.6.1
</version>
+ <version>
3.1.4
</version>
</dependency>
<dependency>
<groupId>net.sourceforge.argparse4j</groupId>
<artifactId>argparse4j</artifactId>
</dependency>
<dependency>
<groupId>net.sourceforge.argparse4j</groupId>
<artifactId>argparse4j</artifactId>
- <version>0.4.3</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>compile</scope>
</dependency>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>com.ning</groupId>
- <artifactId>async-http-client</artifactId>
- <version>1.9.24</version>
- </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk1
5
on</artifactId>
+ <artifactId>bcpkix-jdk1
8
on</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk1
5
on</artifactId>
+ <artifactId>bcprov-jdk1
8
on</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@
-77,10
+57,6
@@
<groupId>${project.groupId}</groupId>
<artifactId>netconf-auth</artifactId>
</dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-auth</artifactId>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>config-netconf-connector</artifactId>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sal-netconf-connector</artifactId>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sal-netconf-connector</artifactId>
@@
-114,12
+90,13
@@
<artifactId>netconf-client</artifactId>
</dependency>
<dependency>
<artifactId>netconf-client</artifactId>
</dependency>
<dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-yang-types-20130715</artifactId>
+ <groupId>com.guicedee.services</groupId>
+ <artifactId>javax.inject</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.opendaylight.mdsal.
model
</groupId>
- <artifactId>
ietf-inet-types-2013-07-15
</artifactId>
+ <groupId>org.opendaylight.mdsal.
binding.model.ietf
</groupId>
+ <artifactId>
rfc6991
</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@
-130,29
+107,36
@@
<artifactId>netconf-mapping-api</artifactId>
</dependency>
<dependency>
<artifactId>netconf-mapping-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>netconf-monitoring</artifactId>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>netconf-ssh</artifactId>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>mdsal-netconf-monitoring</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.opendaylight.
controller
</groupId>
- <artifactId>
netty-config-api
</artifactId>
+ <groupId>org.opendaylight.
mdsal
</groupId>
+ <artifactId>
mdsal-dom-broker
</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.opendaylight.
controller
</groupId>
- <artifactId>
sal
-inmemory-datastore</artifactId>
+ <groupId>org.opendaylight.
mdsal
</groupId>
+ <artifactId>
mdsal-dom
-inmemory-datastore</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>mdsal-netconf-connector</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>mdsal-netconf-connector</artifactId>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>mdsal-netconf-ssh</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
- <version>${karaf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.xmlunit</groupId>
+ <artifactId>xmlunit-assertj</artifactId>
</dependency>
</dependencies>
</dependency>
</dependencies>
@@
-171,17
+155,17
@@
<artifactItems>
<artifactItem>
<groupId>org.bouncycastle</groupId>
<artifactItems>
<artifactItem>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk1
5
on</artifactId>
+ <artifactId>bcpkix-jdk1
8
on</artifactId>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
<overWrite>true</overWrite>
- <destFileName>bcpkix-jdk1
5
on.jar</destFileName>
+ <destFileName>bcpkix-jdk1
8
on.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.bouncycastle</groupId>
</artifactItem>
<artifactItem>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk1
5
on</artifactId>
+ <artifactId>bcprov-jdk1
8
on</artifactId>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
<overWrite>true</overWrite>
- <destFileName>bcprov-jdk1
5
on.jar</destFileName>
+ <destFileName>bcprov-jdk1
8
on.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</artifactItem>
</artifactItems>
</configuration>
@@
-257,7
+241,7
@@
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>org.opendaylight.netconf.test.tool.client.stress.StressClient</Main-Class>
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>org.opendaylight.netconf.test.tool.client.stress.StressClient</Main-Class>
- <Class-Path>. lib lib/bcprov-jdk1
5on.jar lib/bcpkix-jdk15
on.jar</Class-Path>
+ <Class-Path>. lib lib/bcprov-jdk1
8on.jar lib/bcpkix-jdk18
on.jar</Class-Path>
</manifestEntries>
</transformer>
</transformers>
</manifestEntries>
</transformer>
</transformers>
@@
-332,7
+316,7
@@
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>org.opendaylight.netconf.test.tool.ScaleUtil</Main-Class>
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>org.opendaylight.netconf.test.tool.ScaleUtil</Main-Class>
- <Class-Path>. lib lib/bcprov-jdk1
5on.jar lib/bcpkix-jdk15
on.jar</Class-Path>
+ <Class-Path>. lib lib/bcprov-jdk1
8on.jar lib/bcpkix-jdk18
on.jar</Class-Path>
</manifestEntries>
</transformer>
</transformers>
</manifestEntries>
</transformer>
</transformers>
@@
-361,10
+345,9
@@
</executions>
</plugin>
<plugin>
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
<configuration>
- <
propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion
>
+ <
reportFormat>plain</reportFormat
>
</configuration>
</plugin>
</plugins>
</configuration>
</plugin>
</plugins>