From 8408a7050c48289904eeda4e69e72017f34f421f Mon Sep 17 00:00:00 2001
From: Lyor Goldstein <lgoldstein@apache.org>
Date: Tue, 20 Aug 2024 11:09:14 +0300
Subject: [PATCH] Replace deprecated systemProperties surefire plugin element
 with systemPropertyVariables one

---
 sshd-benchmarks/pom.xml |  1 -
 sshd-core/pom.xml       |  4 ++--
 sshd-git/pom.xml        | 12 ++++++------
 sshd-scp/pom.xml        | 12 ++++++------
 sshd-sftp/pom.xml       | 12 ++++++------
 5 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/sshd-benchmarks/pom.xml b/sshd-benchmarks/pom.xml
index f3e1e908f..7c2393931 100644
--- a/sshd-benchmarks/pom.xml
+++ b/sshd-benchmarks/pom.xml
@@ -175,5 +175,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/sshd-core/pom.xml b/sshd-core/pom.xml
index eef8acd01..1fe24b619 100644
--- a/sshd-core/pom.xml
+++ b/sshd-core/pom.xml
@@ -255,13 +255,13 @@
                                 </goals>
                                 <configuration>
                                     <reportsDirectory>${project.build.directory}/surefire-reports-jce</reportsDirectory>
-                                    <systemProperties>
+                                    <systemPropertyVariables>
                                         <!-- Enable using deprecated ssh-rsa signature keys with JSch 0.2.x -->
                                         <jsch.server_host_key>ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,rsa-sha2-512,rsa-sha2-256,ssh-rsa</jsch.server_host_key>
                                         <org.apache.sshd.security.provider.BC.enabled>false</org.apache.sshd.security.provider.BC.enabled>
                                         <!-- deprecated -->
                                         <org.apache.sshd.registerBouncyCastle>false</org.apache.sshd.registerBouncyCastle>
-                                    </systemProperties>
+                                    </systemPropertyVariables>
                                     <excludes>
                                         <!-- These tests fail inexplicably without Bouncycastle -->
                                         <exclude>**/*LoadTest.java</exclude>
diff --git a/sshd-git/pom.xml b/sshd-git/pom.xml
index dbe93f822..d1160abff 100644
--- a/sshd-git/pom.xml
+++ b/sshd-git/pom.xml
@@ -142,9 +142,9 @@
                 <configuration>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                     <reportsDirectory>${project.build.directory}/surefire-reports-nio2</reportsDirectory>
-                    <systemProperties>
+                    <systemPropertyVariables>
                         <org.apache.sshd.common.io.IoServiceFactoryFactory>org.apache.sshd.common.io.nio2.Nio2ServiceFactoryFactory</org.apache.sshd.common.io.IoServiceFactoryFactory>
-                    </systemProperties>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
             <plugin>
@@ -190,9 +190,9 @@
                                 <configuration>
                                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                                     <reportsDirectory>${project.build.directory}/surefire-reports-mina</reportsDirectory>
-                                    <systemProperties>
+                                    <systemPropertyVariables>
                                         <org.apache.sshd.common.io.IoServiceFactoryFactory>org.apache.sshd.mina.MinaServiceFactoryFactory</org.apache.sshd.common.io.IoServiceFactoryFactory>
-                                    </systemProperties>
+                                    </systemPropertyVariables>
                                 </configuration>
                             </execution>
                         </executions>
@@ -233,9 +233,9 @@
                                 <configuration>
                                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                                     <reportsDirectory>${project.build.directory}/surefire-reports-netty</reportsDirectory>
-                                    <systemProperties>
+                                    <systemPropertyVariables>
                                         <org.apache.sshd.common.io.IoServiceFactoryFactory>org.apache.sshd.netty.NettyIoServiceFactoryFactory</org.apache.sshd.common.io.IoServiceFactoryFactory>
-                                    </systemProperties>
+                                    </systemPropertyVariables>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/sshd-scp/pom.xml b/sshd-scp/pom.xml
index 4f7fdf9ad..f9b416652 100644
--- a/sshd-scp/pom.xml
+++ b/sshd-scp/pom.xml
@@ -114,11 +114,11 @@
                 <configuration>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                     <reportsDirectory>${project.build.directory}/surefire-reports-nio2</reportsDirectory>
-                    <systemProperties>
+                    <systemPropertyVariables>
                         <!-- Enable using deprecated ssh-rsa signature keys with JSch 0.2.x -->
                         <jsch.server_host_key>ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,rsa-sha2-512,rsa-sha2-256,ssh-rsa</jsch.server_host_key>
                         <org.apache.sshd.common.io.IoServiceFactoryFactory>org.apache.sshd.common.io.nio2.Nio2ServiceFactoryFactory</org.apache.sshd.common.io.IoServiceFactoryFactory>
-                    </systemProperties>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
             <plugin>
@@ -164,9 +164,9 @@
                                 <configuration>
                                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                                     <reportsDirectory>${project.build.directory}/surefire-reports-mina</reportsDirectory>
-                                    <systemProperties>
+                                    <systemPropertyVariables>
                                         <org.apache.sshd.common.io.IoServiceFactoryFactory>org.apache.sshd.mina.MinaServiceFactoryFactory</org.apache.sshd.common.io.IoServiceFactoryFactory>
-                                    </systemProperties>
+                                    </systemPropertyVariables>
                                 </configuration>
                             </execution>
                         </executions>
@@ -207,9 +207,9 @@
                                 <configuration>
                                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                                     <reportsDirectory>${project.build.directory}/surefire-reports-netty</reportsDirectory>
-                                    <systemProperties>
+                                    <systemPropertyVariables>
                                         <org.apache.sshd.common.io.IoServiceFactoryFactory>org.apache.sshd.netty.NettyIoServiceFactoryFactory</org.apache.sshd.common.io.IoServiceFactoryFactory>
-                                    </systemProperties>
+                                    </systemPropertyVariables>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/sshd-sftp/pom.xml b/sshd-sftp/pom.xml
index eedf20d87..ef2a91f87 100644
--- a/sshd-sftp/pom.xml
+++ b/sshd-sftp/pom.xml
@@ -121,11 +121,11 @@
                 <configuration>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                     <reportsDirectory>${project.build.directory}/surefire-reports-nio2</reportsDirectory>
-                    <systemProperties>
+                    <systemPropertyVariables>
                         <!-- Enable using deprecated ssh-rsa signature keys with JSch 0.2.x -->
                         <jsch.server_host_key>ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,rsa-sha2-512,rsa-sha2-256,ssh-rsa</jsch.server_host_key>
                         <org.apache.sshd.common.io.IoServiceFactoryFactory>org.apache.sshd.common.io.nio2.Nio2ServiceFactoryFactory</org.apache.sshd.common.io.IoServiceFactoryFactory>
-                    </systemProperties>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
             <plugin>
@@ -171,9 +171,9 @@
                                 <configuration>
                                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                                     <reportsDirectory>${project.build.directory}/surefire-reports-mina</reportsDirectory>
-                                    <systemProperties>
+                                    <systemPropertyVariables>
                                         <org.apache.sshd.common.io.IoServiceFactoryFactory>org.apache.sshd.mina.MinaServiceFactoryFactory</org.apache.sshd.common.io.IoServiceFactoryFactory>
-                                    </systemProperties>
+                                    </systemPropertyVariables>
                                 </configuration>
                             </execution>
                         </executions>
@@ -214,9 +214,9 @@
                                 <configuration>
                                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                                     <reportsDirectory>${project.build.directory}/surefire-reports-netty</reportsDirectory>
-                                    <systemProperties>
+                                    <systemPropertyVariables>
                                         <org.apache.sshd.common.io.IoServiceFactoryFactory>org.apache.sshd.netty.NettyIoServiceFactoryFactory</org.apache.sshd.common.io.IoServiceFactoryFactory>
-                                    </systemProperties>
+                                    </systemPropertyVariables>
                                 </configuration>
                             </execution>
                         </executions>