Skip to content

Commit

Permalink
[JENKINS-48232] Upgrading test dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@fcojfernandez
fcojfernandez committed Nov 27, 2017
1 parent 55e3d31 commit 881987a
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 27 deletions.
6 changes: 3 additions & 3 deletions pom.xml
View file
Expand Up @@ -66,8 +66,8 @@
</scm>

<properties>
<jenkins.version>1.609</jenkins.version>
<java.level>6</java.level>
<jenkins.version>2.7.1</jenkins.version>
<java.level>7</java.level>
</properties>

<repositories>
Expand Down Expand Up @@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<version>0.12.0</version>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
12 changes: 6 additions & 6 deletions ...a/com/cloudbees/jenkins/plugins/sshcredentials/impl/JSchSSHPasswordAuthenticatorTest.java
View file
Expand Up @@ -31,11 +31,11 @@
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.UserInfo;
import hudson.model.Items;
import org.apache.sshd.SshServer;
import org.apache.sshd.server.SshServer;
import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.server.PasswordAuthenticator;
import org.apache.sshd.server.UserAuth;
import org.apache.sshd.server.auth.UserAuthPassword;
import org.apache.sshd.server.auth.password.PasswordAuthenticator;
import org.apache.sshd.server.auth.UserAuth;
import org.apache.sshd.server.auth.password.UserAuthPasswordFactory;
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
import org.apache.sshd.server.session.ServerSession;
import org.junit.After;
Expand Down Expand Up @@ -104,7 +104,7 @@ public boolean authenticate(String username, String password, ServerSession sess
return "foomanchu".equals(password);
}
});
sshd.setUserAuthFactories(Arrays.<NamedFactory<UserAuth>>asList(new UserAuthPassword.Factory()));
sshd.setUserAuthFactories(Arrays.<NamedFactory<UserAuth>>asList(new UserAuthPasswordFactory()));
try {
sshd.start();
connector = new JSchConnector(user.getUsername(),"localhost", sshd.getPort());
Expand Down Expand Up @@ -136,7 +136,7 @@ public boolean authenticate(String username, String password, ServerSession sess
return "foomanchu".equals(password);
}
});
sshd.setUserAuthFactories(Arrays.<NamedFactory<UserAuth>>asList(new UserAuthPassword.Factory()));
sshd.setUserAuthFactories(Arrays.<NamedFactory<UserAuth>>asList(new UserAuthPasswordFactory()));
try {
sshd.start();
connector = new JSchConnector(user.getUsername(),"localhost", sshd.getPort());
Expand Down
12 changes: 6 additions & 6 deletions .../com/cloudbees/jenkins/plugins/sshcredentials/impl/JSchSSHPublicKeyAuthenticatorTest.java
View file
Expand Up @@ -30,11 +30,11 @@
import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.util.Secret;
import org.apache.sshd.SshServer;
import org.apache.sshd.server.SshServer;
import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.server.PublickeyAuthenticator;
import org.apache.sshd.server.UserAuth;
import org.apache.sshd.server.auth.UserAuthPublicKey;
import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
import org.apache.sshd.server.auth.UserAuth;
import org.apache.sshd.server.auth.pubkey.UserAuthPublicKeyFactory;
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
import org.apache.sshd.server.session.ServerSession;
import org.junit.After;
Expand Down Expand Up @@ -145,7 +145,7 @@ public boolean authenticate(String username, PublicKey key, ServerSession sessio
return username.equals("foobar");
}
});
sshd.setUserAuthFactories(Arrays.<NamedFactory<UserAuth>>asList(new UserAuthPublicKey.Factory()));
sshd.setUserAuthFactories(Arrays.<NamedFactory<UserAuth>>asList(new UserAuthPublicKeyFactory()));
try {
sshd.start();
connector = new JSchConnector(user.getUsername(), "localhost", sshd.getPort());
Expand Down Expand Up @@ -178,7 +178,7 @@ public boolean authenticate(String username, PublicKey key, ServerSession sessio
return username.equals("foobar");
}
});
sshd.setUserAuthFactories(Arrays.<NamedFactory<UserAuth>>asList(new UserAuthPublicKey.Factory()));
sshd.setUserAuthFactories(Arrays.<NamedFactory<UserAuth>>asList(new UserAuthPublicKeyFactory()));
try {
sshd.start();
connector = new JSchConnector(user.getUsername(), "localhost", sshd.getPort());
Expand Down
10 changes: 5 additions & 5 deletions ...om/cloudbees/jenkins/plugins/sshcredentials/impl/TrileadSSHPasswordAuthenticatorTest.java
View file
Expand Up @@ -34,11 +34,11 @@
import hudson.slaves.DumbSlave;
import jenkins.security.MasterToSlaveCallable;

import org.apache.sshd.SshServer;
import org.apache.sshd.server.SshServer;
import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.server.PasswordAuthenticator;
import org.apache.sshd.server.UserAuth;
import org.apache.sshd.server.auth.UserAuthPassword;
import org.apache.sshd.server.auth.password.PasswordAuthenticator;
import org.apache.sshd.server.auth.UserAuth;
import org.apache.sshd.server.auth.password.UserAuthPasswordFactory;
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
import org.apache.sshd.server.session.ServerSession;
import org.junit.After;
Expand Down Expand Up @@ -124,7 +124,7 @@ public boolean authenticate(String _username, String password, ServerSession ses
return (username == null || username.equals(_username)) && "foomanchu".equals(password);
}
});
sshd.setUserAuthFactories(Arrays.<NamedFactory<UserAuth>>asList(new UserAuthPassword.Factory()));
sshd.setUserAuthFactories(Arrays.<NamedFactory<UserAuth>>asList(new UserAuthPasswordFactory()));
return sshd;
}

Expand Down
14 changes: 7 additions & 7 deletions ...m/cloudbees/jenkins/plugins/sshcredentials/impl/TrileadSSHPublicKeyAuthenticatorTest.java
View file
Expand Up @@ -32,11 +32,11 @@
import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.util.Secret;
import org.apache.sshd.SshServer;
import org.apache.sshd.server.SshServer;
import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.server.PublickeyAuthenticator;
import org.apache.sshd.server.UserAuth;
import org.apache.sshd.server.auth.UserAuthPublicKey;
import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
import org.apache.sshd.server.auth.UserAuth;
import org.apache.sshd.server.auth.pubkey.UserAuthPublicKeyFactory;
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
import org.apache.sshd.server.session.ServerSession;
import org.junit.After;
Expand Down Expand Up @@ -145,7 +145,7 @@ public boolean authenticate(String username, PublicKey key, ServerSession sessio
return username.equals("foobar");
}
});
sshd.setUserAuthFactories(Arrays.<NamedFactory<UserAuth>>asList(new UserAuthPublicKey.Factory()));
sshd.setUserAuthFactories(Arrays.<NamedFactory<UserAuth>>asList(new UserAuthPublicKeyFactory()));
try {
sshd.start();
connection = new Connection("localhost", sshd.getPort());
Expand Down Expand Up @@ -181,7 +181,7 @@ public boolean authenticate(String username, PublicKey key, ServerSession sessio
return username.equals("foobar");
}
});
sshd.setUserAuthFactories(Arrays.<NamedFactory<UserAuth>>asList(new UserAuthPublicKey.Factory()));
sshd.setUserAuthFactories(Arrays.<NamedFactory<UserAuth>>asList(new UserAuthPublicKeyFactory()));
try {
sshd.start();
connection = new Connection("localhost", sshd.getPort());
Expand Down Expand Up @@ -216,7 +216,7 @@ public boolean authenticate(String username, PublicKey key, ServerSession sessio
return username.equals("bill");
}
});
sshd.setUserAuthFactories(Arrays.<NamedFactory<UserAuth>>asList(new UserAuthPublicKey.Factory()));
sshd.setUserAuthFactories(Arrays.<NamedFactory<UserAuth>>asList(new UserAuthPublicKeyFactory()));
try {
sshd.start();
connection = new Connection("localhost", sshd.getPort());
Expand Down

0 comments on commit 881987a

Please sign in to comment.