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 7872771f3e70bafe431be706e259e6eb2e0b86e9..a6e455a997a86dbaf17e297b23a98fdf880849aa 100644
(file)
--- a/
netconf/tools/netconf-testtool/pom.xml
+++ b/
netconf/tools/netconf-testtool/pom.xml
@@
-14,14
+14,12
@@
<parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-parent</artifactId>
<parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-parent</artifactId>
- <version>
1.6
.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.6.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<packaging>jar</packaging>
<properties>
@@
-32,30
+30,25
@@
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<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.
8.1
</version>
+ <version>0.
9.0
</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.40</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>
@@
-97,6
+90,11
@@
<groupId>${project.groupId}</groupId>
<artifactId>netconf-client</artifactId>
</dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netconf-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.guicedee.services</groupId>
+ <artifactId>javax.inject</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
<artifactId>rfc6991</artifactId>
<dependency>
<groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
<artifactId>rfc6991</artifactId>
@@
-110,12
+108,12
@@
<artifactId>netconf-mapping-api</artifactId>
</dependency>
<dependency>
<artifactId>netconf-mapping-api</artifactId>
</dependency>
<dependency>
- <groupId>
${project.groupId}
</groupId>
- <artifactId>netconf-monitoring</artifactId>
+ <groupId>
org.opendaylight.netconf
</groupId>
+ <artifactId>
mdsal-
netconf-monitoring</artifactId>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>
${project.groupId}
</groupId>
- <artifactId>
netconf-ssh
</artifactId>
+ <groupId>
org.opendaylight.mdsal
</groupId>
+ <artifactId>
mdsal-dom-broker
</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
@@
-125,11
+123,23
@@
<groupId>org.opendaylight.netconf</groupId>
<artifactId>mdsal-netconf-connector</artifactId>
</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>
<version>${karaf.version}</version>
</dependency>
<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>
<build>
</dependencies>
<build>
@@
-147,17
+157,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>
@@
-233,7
+243,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>
@@
-308,7
+318,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>
@@
-336,6
+346,12
@@
</execution>
</executions>
</plugin>
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <reportFormat>plain</reportFormat>
+ </configuration>
+ </plugin>
</plugins>
</build>
</plugins>
</build>