X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Ftools%2Fnetconf-testtool%2Fpom.xml;h=a966c051837fabd2765ce8c2654aa144e2f198b7;hb=7ee80deb64be2f4081dbd8039d309c920ce6412e;hp=fa1e85ed1e25d0674ed8255b13e24d953323b4a7;hpb=9b80e63527cf2a9844d4a6b2e743c45169d19777;p=netconf.git

diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml
index fa1e85ed1e..a966c05183 100644
--- a/netconf/tools/netconf-testtool/pom.xml
+++ b/netconf/tools/netconf-testtool/pom.xml
@@ -12,35 +12,32 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
-        <relativePath/>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>netconf-parent</artifactId>
+        <version>1.6.2-SNAPSHOT</version>
+        <relativePath>../../netconf-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-testtool</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.6.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>netconf-subsystem</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+    <properties>
+        <sonar.skip>true</sonar.skip>
+    </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.codehaus.janino</groupId>
+            <artifactId>janino</artifactId>
+            <version>2.6.1</version>
+        </dependency>
         <dependency>
             <groupId>net.sourceforge.argparse4j</groupId>
             <artifactId>argparse4j</artifactId>
-            <version>0.4.3</version>
+            <version>0.8.1</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -50,7 +47,7 @@
         <dependency>
             <groupId>com.ning</groupId>
             <artifactId>async-http-client</artifactId>
-            <version>1.9.24</version>
+            <version>1.9.40</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
@@ -68,19 +65,11 @@
             <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>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>logback-config</artifactId>
-        </dependency>
-        <dependency>
+       <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
@@ -92,10 +81,6 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-api</artifactId>
@@ -113,12 +98,8 @@
             <artifactId>netconf-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -129,25 +110,30 @@
             <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>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-config-api</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-dom-broker</artifactId>
         </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>
+            <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>
     </dependencies>
 
     <build>
@@ -205,108 +191,103 @@
                                     </excludes>
                                 </filter>
                             </filters>
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>com.ning</exclude>
-                                </excludes>
-                            </artifactSet>
-                            <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.opendaylight.netconf.test.tool.Main</mainClass>
-                                </transformer>
-                            </transformers>
-                            <shadedArtifactAttached>true</shadedArtifactAttached>
-                            <shadedClassifierName>executable</shadedClassifierName>
-                        </configuration>
-                    </execution>
+                              <transformers>
+                                  <transformer
+                                          implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                      <mainClass>org.opendaylight.netconf.test.tool.Main</mainClass>
+                                  </transformer>
+                              </transformers>
+                              <shadedArtifactAttached>true</shadedArtifactAttached>
+                              <shadedClassifierName>executable</shadedClassifierName>
+                          </configuration>
+                      </execution>
 
-                    <execution>
-                        <id>stress-client</id>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <shadedArtifactId>stress-client</shadedArtifactId>
-                            <filters>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                        <exclude>org.opendaylight.netconf.test.tool.client.http</exclude>
-                                        <exclude>org.opendaylight.netconf.test.tool.rpc</exclude>
-                                        <exclude>AcceptingAuthProvider</exclude>
-                                        <exclude>org.opendaylight.netconf.test.tool.DummyMonitoringService</exclude>
-                                        <exclude>org.opendaylight.netconf.test.tool.FakeCapability</exclude>
-                                        <exclude>org.opendaylight.netconf.test.tool.Main</exclude>
-                                        <exclude>org.opendaylight.netconf.test.tool.NetconfDeviceSimulator</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>org.bouncycastle:*</exclude>
-                                </excludes>
-                            </artifactSet>
-                            <transformers>
-                                <transformer
-                                        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>
-                                    </manifestEntries>
-                                </transformer>
-                            </transformers>
-                            <shadedArtifactAttached>true</shadedArtifactAttached>
-                            <shadedClassifierName>stress-client</shadedClassifierName>
-                        </configuration>
-                    </execution>
+                      <execution>
+                          <id>stress-client</id>
+                          <goals>
+                              <goal>shade</goal>
+                          </goals>
+                          <phase>package</phase>
+                          <configuration>
+                              <shadedArtifactId>stress-client</shadedArtifactId>
+                              <filters>
+                                  <filter>
+                                      <artifact>*:*</artifact>
+                                      <excludes>
+                                          <exclude>META-INF/*.SF</exclude>
+                                          <exclude>META-INF/*.DSA</exclude>
+                                          <exclude>META-INF/*.RSA</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.client.http</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.rpc</exclude>
+                                          <exclude>AcceptingAuthProvider</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.DummyMonitoringService</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.FakeCapability</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.Main</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.NetconfDeviceSimulator</exclude>
+                                      </excludes>
+                                  </filter>
+                              </filters>
+                              <artifactSet>
+                                  <excludes>
+                                     <exclude>org.bouncycastle:*</exclude>
+                                  </excludes>
+                              </artifactSet>
+                              <transformers>
+                                  <transformer
+                                          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>
+                                      </manifestEntries>
+                                  </transformer>
+                              </transformers>
+                              <shadedArtifactAttached>true</shadedArtifactAttached>
+                              <shadedClassifierName>stress-client</shadedClassifierName>
+                          </configuration>
+                      </execution>
 
-                    <execution>
-                        <id>restconf-perf-client</id>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <shadedArtifactId>rest-perf-client</shadedArtifactId>
-                            <filters>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                        <exclude>org.opendaylight.netconf.test.tool.rpc</exclude>
-                                        <exclude>AcceptingAuthProvider</exclude>
-                                        <exclude>org.opendaylight.netconf.test.tool.DummyMonitoringService</exclude>
-                                        <exclude>org.opendaylight.netconf.test.tool.FakeCapability</exclude>
-                                        <exclude>org.opendaylight.netconf.test.tool.Main</exclude>
-                                        <exclude>org.opendaylight.netconf.test.tool.NetconfDeviceSimulator</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>org.bouncycastle:*</exclude>
-                                    <exclude>com.google:*</exclude>
-                                    <exclude>org.opendaylight.yangtools</exclude>
-                                    <exclude>org.opendaylight.yang</exclude>
-                                </excludes>
-                            </artifactSet>
-                            <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.opendaylight.netconf.test.tool.client.http.perf.RestPerfClient</mainClass>
-                                </transformer>
-                            </transformers>
-                            <shadedArtifactAttached>true</shadedArtifactAttached>
-                            <shadedClassifierName>rest-perf-client</shadedClassifierName>
-                        </configuration>
-                    </execution>
+                      <execution>
+                          <id>restconf-perf-client</id>
+                          <goals>
+                              <goal>shade</goal>
+                          </goals>
+                          <phase>package</phase>
+                          <configuration>
+                              <shadedArtifactId>rest-perf-client</shadedArtifactId>
+                              <filters>
+                                  <filter>
+                                      <artifact>*:*</artifact>
+                                      <excludes>
+                                          <exclude>META-INF/*.SF</exclude>
+                                          <exclude>META-INF/*.DSA</exclude>
+                                          <exclude>META-INF/*.RSA</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.rpc</exclude>
+                                          <exclude>AcceptingAuthProvider</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.DummyMonitoringService</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.FakeCapability</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.Main</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.NetconfDeviceSimulator</exclude>
+                                      </excludes>
+                                  </filter>
+                              </filters>
+                              <artifactSet>
+                                  <excludes>
+                                      <exclude>org.bouncycastle:*</exclude>
+                                      <exclude>com.google:*</exclude>
+                                      <exclude>org.opendaylight.yangtools</exclude>
+                                      <exclude>org.opendaylight.yang</exclude>
+                                  </excludes>
+                              </artifactSet>
+                              <transformers>
+                                  <transformer
+                                          implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                      <mainClass>org.opendaylight.netconf.test.tool.client.http.perf.RestPerfClient</mainClass>
+                                  </transformer>
+                              </transformers>
+                              <shadedArtifactAttached>true</shadedArtifactAttached>
+                              <shadedClassifierName>rest-perf-client</shadedClassifierName>
+                          </configuration>
+                      </execution>
 
                     <execution>
                         <id>scale-util</id>
@@ -339,27 +320,27 @@
                             <shadedClassifierName>scale-util</shadedClassifierName>
                         </configuration>
                     </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/stress-client.xml</descriptor>
-                    </descriptors>
-                    <finalName>stress-client-${project.version}-package</finalName>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+                  </executions>
+              </plugin>
+              <plugin>
+                  <artifactId>maven-assembly-plugin</artifactId>
+                  <configuration>
+                      <descriptors>
+                          <descriptor>src/main/assembly/stress-client.xml</descriptor>
+                      </descriptors>
+                      <finalName>stress-client-${project.version}-package</finalName>
+                  </configuration>
+                  <executions>
+                      <execution>
+                          <id>make-assembly</id>
+                          <phase>package</phase>
+                          <goals>
+                              <goal>single</goal>
+                          </goals>
+                      </execution>
+                  </executions>
+              </plugin>
+          </plugins>
+      </build>
 
-</project>
+  </project>