Code Review / controller.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | compact (merge: 531621a 4c05ae5)
Merge changes I8b1a0281,Ib6342c74
authorTony Tkacik <ttkacik@cisco.com>
Mon, 27 Oct 2014 11:23:18 +0000 (11:23 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 27 Oct 2014 11:23:18 +0000 (11:23 +0000)
* changes:
  BUG-1612 Remove ganymed third party ssh lib (replaced by mina ssh)
  BUG-1612 Remove ganymed implementation of SSH server wrapper.

1  2 
opendaylight/commons/opendaylight/pom.xml patch | diff1 | diff2 | blob | history
opendaylight/distribution/opendaylight/pom.xml patch | diff1 | diff2 | blob | history

diff --combined opendaylight/commons/opendaylight/pom.xml
index 23542dd62b897f74b58654f7c59295a86e28f04a,4dfe7dbb4188a930234b3d868eb4484d4cfca851..198d17a79a66931ebb8e19a55d97372c09485b14
--- 1/opendaylight/commons/opendaylight/pom.xml
--- 2/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@@ -106,7 -106,6 +106,6 @@@
      <forwarding.staticrouting.northbound.version>0.5.0-SNAPSHOT</forwarding.staticrouting.northbound.version>
      <forwardingrulesmanager.implementation.version>0.5.0-SNAPSHOT</forwardingrulesmanager.implementation.version>
      <forwardingrulesmanager.version>0.7.0-SNAPSHOT</forwardingrulesmanager.version>
-     <ganymed.version>1.2.0-SNAPSHOT</ganymed.version>
      <hosttracker.api.version>0.6.0-SNAPSHOT</hosttracker.api.version>
      <hosttracker.implementation.version>0.6.0-SNAPSHOT</hosttracker.implementation.version>
      <hosttracker.northbound.version>0.5.0-SNAPSHOT</hosttracker.northbound.version>
@@@ -180,7 -179,7 +179,7 @@@
      <sonar.language>java</sonar.language>
      <sonar.jacoco.reportPath>target/code-coverage/jacoco.exec</sonar.jacoco.reportPath>
      <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-     <sonar.skippedModules>org.openflow.openflowj,net.sf.jung2,org.opendaylight.controller.protobuff.messages,ch.ethz.ssh2</sonar.skippedModules>
+     <sonar.skippedModules>org.openflow.openflowj,net.sf.jung2,org.opendaylight.controller.protobuff.messages</sonar.skippedModules>
      <sonar.profile>Sonar way with Findbugs</sonar.profile>
      <spifly.version>1.0.0</spifly.version>
      <spring-osgi.version>1.2.1</spring-osgi.version>
@@@ -218,14 -217,21 +217,14 @@@
  
    <dependencyManagement>
      <dependencies>
 +
         <!-- project specific dependencies -->
        <dependency>
 -        <groupId>${project.groupId}</groupId>
 -        <artifactId>ietf-netconf-monitoring</artifactId>
 -        <version>${netconf.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>${project.groupId}</groupId>
 -        <artifactId>ietf-netconf-monitoring-extension</artifactId>
 -        <version>${netconf.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>${project.groupId}</groupId>
 -        <artifactId>netconf-netty-util</artifactId>
 +        <groupId>org.opendaylight.controller</groupId>
 +        <artifactId>netconf-artifacts</artifactId>
          <version>${netconf.version}</version>
 +        <type>pom</type>
 +        <scope>import</scope>
        </dependency>
        <dependency>
          <groupId>org.apache.sshd</groupId>
@@@ -856,6 -862,11 +855,6 @@@
          <artifactId>config-manager</artifactId>
          <version>${config.version}</version>
        </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.controller</groupId>
 -        <artifactId>config-netconf-connector</artifactId>
 -        <version>${netconf.version}</version>
 -      </dependency>
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>config-persister-api</artifactId>
@@@ -882,6 -893,11 +881,6 @@@
          <artifactId>config-persister-feature-adapter</artifactId>
          <version>${config.version}</version>
        </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.controller</groupId>
 -        <artifactId>config-persister-impl</artifactId>
 -        <version>${netconf.version}</version>
 -      </dependency>
  
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
@@@ -1053,6 -1069,94 +1052,6 @@@
          <version>${dummy-console.version}</version>
        </dependency>
  
 -      <!-- Netconf -->
 -      <dependency>
 -        <groupId>org.opendaylight.controller</groupId>
 -        <artifactId>netconf-api</artifactId>
 -        <version>${netconf.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.controller</groupId>
 -        <artifactId>netconf-client</artifactId>
 -        <version>${netconf.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.controller</groupId>
 -        <artifactId>netconf-client</artifactId>
 -        <version>${netconf.version}</version>
 -        <type>test-jar</type>
 -      </dependency>
 -
 -      <!--Netconf config-->
 -      <dependency>
 -        <groupId>org.opendaylight.controller</groupId>
 -        <artifactId>netconf-config-dispatcher</artifactId>
 -        <version>${netconf.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.controller</groupId>
 -        <artifactId>netconf-impl</artifactId>
 -        <version>${netconf.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.controller</groupId>
 -        <artifactId>netconf-impl</artifactId>
 -        <version>${netconf.version}</version>
 -        <type>test-jar</type>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.controller</groupId>
 -        <artifactId>netconf-mapping-api</artifactId>
 -        <version>${netconf.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.controller</groupId>
 -        <artifactId>netconf-monitoring</artifactId>
 -        <version>${netconf.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.controller</groupId>
 -        <artifactId>netconf-netty-util</artifactId>
 -        <version>${netconf.version}</version>
 -        <type>test-jar</type>
 -      </dependency>
 -        <dependency>
 -            <groupId>org.opendaylight.controller</groupId>
 -            <artifactId>netconf-auth</artifactId>
 -            <version>${netconf.version}</version>
 -        </dependency>
 -        <dependency>
 -            <groupId>org.opendaylight.controller</groupId>
 -            <artifactId>netconf-usermanager</artifactId>
 -            <version>${netconf.version}</version>
 -        </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.controller</groupId>
 -        <artifactId>netconf-ssh</artifactId>
 -        <version>${netconf.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.controller</groupId>
 -        <artifactId>netconf-ssh</artifactId>
 -        <version>${netconf.version}</version>
 -        <type>test-jar</type>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.controller</groupId>
 -        <artifactId>netconf-tcp</artifactId>
 -        <version>${netconf.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.controller</groupId>
 -        <artifactId>netconf-util</artifactId>
 -        <version>${netconf.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.controller</groupId>
 -        <artifactId>netconf-util</artifactId>
 -        <version>${netconf.version}</version>
 -        <type>test-jar</type>
 -      </dependency>
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>netty-config-api</artifactId>
@@@ -1245,6 -1349,16 +1244,6 @@@
          <artifactId>md-sal-config</artifactId>
          <version>${mdsal.version}</version>
        </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.controller</groupId>
 -        <artifactId>netconf-config</artifactId>
 -        <version>${netconf.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.controller</groupId>
 -        <artifactId>netconf-connector-config</artifactId>
 -        <version>${netconf.version}</version>
 -      </dependency>
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>sal-rest-docgen</artifactId>
@@@ -1576,12 -1690,6 +1575,7 @@@
          <artifactId>com.sun.jersey.jersey-servlet</artifactId>
          <version>${jersey-servlet.version}</version>
        </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller.thirdparty</groupId>
-         <artifactId>ganymed</artifactId>
-         <version>${ganymed.version}</version>
-       </dependency>
 +
        <!-- Third parties from opendaylight released -->
        <dependency>
          <groupId>org.opendaylight.controller.thirdparty</groupId>
@@@ -1598,16 -1706,174 +1592,16 @@@
          <artifactId>org.openflow.openflowj</artifactId>
          <version>1.0.2</version>
        </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>binding-generator-impl</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>binding-data-codec</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>binding-generator-spi</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>binding-generator-util</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>binding-type-provider</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>concepts</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>object-cache-api</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>object-cache-guava</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>restconf-client-api</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>restconf-client-impl</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>util</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>yang-data-composite-node</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>yang-data-codec-gson</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
  
 -      <!-- yangtools dependencies -->
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>yang-binding</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>yang-common</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>yang-data-api</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>yang-data-impl</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 +      <!-- yangtools artifacts -->
        <dependency>
          <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>yang-data-util</artifactId>
 +        <artifactId>yangtools-artifacts</artifactId>
          <version>${yangtools.version}</version>
 +        <type>pom</type>
 +        <scope>import</scope>
        </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>yang-maven-plugin-spi</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>yang-model-api</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>yang-model-util</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>yang-parser-api</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>yang-parser-impl</artifactId>
 -        <version>${yangtools.version}</version>
 -      </dependency>
 -      <!-- yang model dependencies -->
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools.model</groupId>
 -        <artifactId>ietf-inet-types</artifactId>
 -        <version>${ietf-inet-types.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools.model</groupId>
 -        <artifactId>ietf-restconf</artifactId>
 -        <version>${ietf-restconf.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools.model</groupId>
 -        <artifactId>ietf-topology</artifactId>
 -        <version>${ietf-topology.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools.model</groupId>
 -        <artifactId>ietf-topology-l3-unicast-igp</artifactId>
 -        <version>${ietf-topology.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools.model</groupId>
 -        <artifactId>ietf-yang-types</artifactId>
 -        <version>${ietf-yang-types.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools.model</groupId>
 -        <artifactId>ietf-yang-types-20130715</artifactId>
 -        <version>2013.07.15.7-SNAPSHOT</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools.model</groupId>
 -        <artifactId>opendaylight-l2-types</artifactId>
 -        <version>${opendaylight-l2-types.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools.model</groupId>
 -        <artifactId>yang-ext</artifactId>
 -        <version>${yang-ext.version}</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools.thirdparty</groupId>
 -        <artifactId>antlr4-runtime-osgi-nohead</artifactId>
 -        <version>4.0</version>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools.thirdparty</groupId>
 -        <artifactId>xtend-lib-osgi</artifactId>
 -        <version>${xtend.version}</version>
 -      </dependency>
 +
        <dependency>
          <groupId>org.openexi</groupId>
          <artifactId>nagasena</artifactId>
@@@ -1678,6 -1944,12 +1672,6 @@@
          <version>${mdsal.version}</version>
          <scope>test</scope>
        </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.yangtools</groupId>
 -        <artifactId>mockito-configuration</artifactId>
 -        <version>${yangtools.version}</version>
 -        <scope>test</scope>
 -      </dependency>
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>features-config</artifactId>
@@@ -1693,6 -1965,14 +1687,6 @@@
          <classifier>features</classifier>
          <type>xml</type>
          <scope>runtime</scope>
 -      </dependency>
 -      <dependency>
 -        <groupId>org.opendaylight.controller</groupId>
 -        <artifactId>features-netconf</artifactId>
 -        <version>${netconf.version}</version>
 -        <classifier>features</classifier>
 -        <type>xml</type>
 -        <scope>runtime</scope>
        </dependency>
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
diff --combined opendaylight/distribution/opendaylight/pom.xml
index 4f0df441fa32db36a75281b5ad6d514294ad7ff4,93be88b4ba381a7da18d3826ddca382d64079960..f6ecb44fa172f02fd4cd5f34824325ad30629ef8
--- 1/opendaylight/distribution/opendaylight/pom.xml
--- 2/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@@ -1152,10 -1152,6 +1152,6 @@@
            <artifactId>sample-toaster-provider</artifactId>
            <version>${mdsal.version}</version>
          </dependency>
-         <dependency>
-           <groupId>org.opendaylight.controller.thirdparty</groupId>
-           <artifactId>ganymed</artifactId>
-         </dependency>
          <dependency>
            <groupId>org.apache.sshd</groupId>
            <artifactId>sshd-core</artifactId>
@@@ -1163,6 -1159,7 +1159,6 @@@
          <dependency>
            <groupId>org.opendaylight.yangtools</groupId>
            <artifactId>binding-generator-api</artifactId>
 -          <version>${yangtools.version}</version>
          </dependency>
          <dependency>
            <groupId>org.opendaylight.yangtools</groupId>
@@@ -1183,6 -1180,7 +1179,6 @@@
          <dependency>
            <groupId>org.opendaylight.yangtools</groupId>
            <artifactId>binding-model-api</artifactId>
 -          <version>${yangtools.version}</version>
          </dependency>
          <dependency>
            <groupId>org.opendaylight.yangtools</groupId>
OpenDaylight controller