X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Ftools%2Fnetconf-testtool%2Fpom.xml;h=b568a0a6df39e82725b87922a72d4bd06e64d273;hb=b21318f71e4e3da4422147d8686dbcaa4b16a7f1;hp=20813ec49190080905e7a60a56008e835fb5159a;hpb=ff4f7c596d486347cead6a42e9096d6179b8ce51;p=netconf.git

diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml
index 20813ec491..b568a0a6df 100644
--- a/netconf/tools/netconf-testtool/pom.xml
+++ b/netconf/tools/netconf-testtool/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
-        <version>2.0.8-SNAPSHOT</version>
+        <version>6.0.0-SNAPSHOT</version>
         <relativePath>../../../parent</relativePath>
     </parent>
 
@@ -35,7 +35,6 @@
         <dependency>
             <groupId>net.sourceforge.argparse4j</groupId>
             <artifactId>argparse4j</artifactId>
-            <version>0.8.1</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -44,11 +43,11 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>bcpkix-jdk18on</artifactId>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -58,6 +57,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-auth</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>netconf-topology</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sal-netconf-connector</artifactId>
@@ -79,16 +82,16 @@
             <artifactId>netconf-api</artifactId>
         </dependency>
         <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>
-            <artifactId>ietf-netconf-monitoring-extension</artifactId>
+            <artifactId>netconf-client</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>netconf-client</artifactId>
+            <artifactId>netconf-server</artifactId>
         </dependency>
         <dependency>
             <groupId>com.guicedee.services</groupId>
@@ -99,14 +102,6 @@
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc6991</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>netconf-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>netconf-mapping-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>mdsal-netconf-monitoring</artifactId>
@@ -121,16 +116,15 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>mdsal-netconf-connector</artifactId>
+            <artifactId>netconf-server-mdsal</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-netconf-ssh</artifactId>
+            <artifactId>netconf-nb</artifactId>
         </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>
@@ -157,17 +151,17 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.bouncycastle</groupId>
-                                    <artifactId>bcpkix-jdk15on</artifactId>
+                                    <artifactId>bcpkix-jdk18on</artifactId>
                                     <outputDirectory>${project.build.directory}/lib</outputDirectory>
                                     <overWrite>true</overWrite>
-                                    <destFileName>bcpkix-jdk15on.jar</destFileName>
+                                    <destFileName>bcpkix-jdk18on.jar</destFileName>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.bouncycastle</groupId>
-                                    <artifactId>bcprov-jdk15on</artifactId>
+                                    <artifactId>bcprov-jdk18on</artifactId>
                                     <outputDirectory>${project.build.directory}/lib</outputDirectory>
                                     <overWrite>true</overWrite>
-                                    <destFileName>bcprov-jdk15on.jar</destFileName>
+                                    <destFileName>bcprov-jdk18on.jar</destFileName>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
@@ -177,7 +171,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <configuration></configuration>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                </configuration>
                 <executions>
                     <execution>
                         <goals>
@@ -243,7 +239,7 @@
                                           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-jdk15on.jar lib/bcpkix-jdk15on.jar</Class-Path>
+                                          <Class-Path>. lib lib/bcprov-jdk18on.jar lib/bcpkix-jdk18on.jar</Class-Path>
                                       </manifestEntries>
                                   </transformer>
                               </transformers>
@@ -318,7 +314,7 @@
                                         implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>
                                         <Main-Class>org.opendaylight.netconf.test.tool.ScaleUtil</Main-Class>
-                                        <Class-Path>. lib lib/bcprov-jdk15on.jar lib/bcpkix-jdk15on.jar</Class-Path>
+                                        <Class-Path>. lib lib/bcprov-jdk18on.jar lib/bcpkix-jdk18on.jar</Class-Path>
                                     </manifestEntries>
                                 </transformer>
                             </transformers>