NIFI-12631 Upgraded Apache MINA SSHD from 2.11.0 to 2.12.0

Signed-off-by: Pierre Villard <[email protected]> This closes apache#8265.
markap14 · Jan 18, 2024 · 74fdd1c · 74fdd1c
1 parent 0e6fb9a
commit 74fdd1c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/nifi-code-coverage/pom.xml b/nifi-code-coverage/pom.xml
@@ -30,6 +30,7 @@
         <ant.version>1.10.14</ant.version>
         <calcite.avatica.version>1.6.0</calcite.avatica.version>
         <avatica.version>1.24.0</avatica.version>
+        <org.apache.sshd.version>2.12.0</org.apache.sshd.version>
     </properties>
 
     <!-- Managed Dependency Versions for referenced modules required based on different parent bundle project -->
@@ -108,6 +109,22 @@
                 <artifactId>core-io</artifactId>
                 <version>1.7.24</version>
             </dependency>
+            <!-- SSHD from Registry and other modules -->
+            <dependency>
+                <groupId>org.apache.sshd</groupId>
+                <artifactId>sshd-core</artifactId>
+                <version>${org.apache.sshd.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.sshd</groupId>
+                <artifactId>sshd-sftp</artifactId>
+                <version>${org.apache.sshd.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.sshd</groupId>
+                <artifactId>sshd-osgi</artifactId>
+                <version>${org.apache.sshd.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -37,7 +37,7 @@
     <properties>
         <yammer.metrics.version>2.2.0</yammer.metrics.version>
         <jolt.version>0.1.8</jolt.version>
-        <org.apache.sshd.version>2.11.0</org.apache.sshd.version>
+        <org.apache.sshd.version>2.12.0</org.apache.sshd.version>
         <tika.version>2.9.1</tika.version>
     </properties>
     <dependencyManagement>

diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml
@@ -41,7 +41,7 @@
         <flyway.tests.version>9.5.0</flyway.tests.version>
         <swagger.ui.version>3.12.0</swagger.ui.version>
         <jgit.version>6.7.0.202309050840-r</jgit.version>
-        <org.apache.sshd.version>2.11.0</org.apache.sshd.version>
+        <org.apache.sshd.version>2.12.0</org.apache.sshd.version>
     </properties>
 
     <dependencyManagement>