Skip to content

Commit

Permalink
Replace deprecated systemProperties surefire plugin element with syst…
Browse files Browse the repository at this point in the history 
…emPropertyVariables one
  • Loading branch information
Lyor Goldstein committed Aug 20, 2024
1 parent 361da19 commit 8408a70
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 21 deletions.
1 change: 0 additions & 1 deletion sshd-benchmarks/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,5 +175,4 @@
</plugin>
</plugins>
</build>

</project>
4 changes: 2 additions & 2 deletions sshd-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 6 additions & 6 deletions sshd-git/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
12 changes: 6 additions & 6 deletions sshd-scp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
12 changes: 6 additions & 6 deletions sshd-sftp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 8408a70

Please sign in to comment.