X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Ftools%2Fnetconf-testtool%2Fpom.xml;h=212e36303e871da24804d3007d0c8e98ac7aa46a;hb=5dfddaad0027a1b23437652c7cc37910686fef70;hp=697421c89233e5a7f0bee995354f92eaeffd944b;hpb=f858a297c0f7f243badfc1eeb0a1715017e68390;p=netconf.git

diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml
index 697421c892..212e36303e 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.5-SNAPSHOT</version>
+        <version>7.0.1</version>
         <relativePath>../../../parent</relativePath>
     </parent>
 
@@ -27,6 +27,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.codehaus.janino</groupId>
             <artifactId>janino</artifactId>
@@ -35,7 +40,6 @@
         <dependency>
             <groupId>net.sourceforge.argparse4j</groupId>
             <artifactId>argparse4j</artifactId>
-            <version>0.8.1</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -44,11 +48,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>
@@ -59,12 +63,12 @@
             <artifactId>netconf-auth</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sal-netconf-connector</artifactId>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>netconf-topology</artifactId>
         </dependency>
-       <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>mockito-configuration</artifactId>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>netconf-client-mdsal</artifactId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -79,16 +83,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>
@@ -97,19 +101,7 @@
         </dependency>
         <dependency>
             <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>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
@@ -121,16 +113,16 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>mdsal-netconf-connector</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>mdsal-netconf-ssh</artifactId>
+            <artifactId>netconf-server-mdsal</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.features</groupId>
             <artifactId>org.apache.karaf.features.core</artifactId>
-            <version>${karaf.version}</version>
+        </dependency>
+
+       <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>mockito-configuration</artifactId>
         </dependency>
         <dependency>
             <groupId>org.xmlunit</groupId>
@@ -157,17 +149,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 +169,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 +237,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 +312,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>
@@ -334,6 +328,8 @@
                       <descriptors>
                           <descriptor>src/main/assembly/stress-client.xml</descriptor>
                       </descriptors>
+                      <overrideGid>0</overrideGid>
+                      <overrideUid>0</overrideUid>
                       <finalName>stress-client-${project.version}-package</finalName>
                   </configuration>
                   <executions>