root
/
jenkins
mirror of https://github.com/jenkinsci/jenkins.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

[JENKINS-64107] Convert SSHD module to a plugin (#5049) 

Co-authored-by: Jesse Glick <jglick@cloudbees.com>
Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
Co-authored-by: Tim Jacomb <timjacomb1+github@gmail.com>
This commit is contained in:
Ivan Fernandez Calvo 2021-02-25 22:05:23 +01:00 committed by GitHub
parent df3756a80e
commit 1648295304
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bom/pom.xml
View File

@ -425,11 +425,6 @@ THE SOFTWARE.
<artifactId>instance-identity</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>ssh-cli-auth</artifactId>
<version>1.8</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>slave-installer</artifactId>
@ -455,11 +450,6 @@ THE SOFTWARE.
<artifactId>systemd-slave-installer</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>sshd</artifactId>
<version>2.7</version>
</dependency>
</dependencies>
</dependencyManagement>

3
core/src/main/resources/jenkins/split-plugins.txt
View File

@ -29,5 +29,8 @@ jdk-tool 2.112 1.0
# JENKINS-55681
jaxb 2.163 2.3.0 11
# JENKINS-64107
sshd 2.281 3.0.1
#JENKINS-43610 Split Trilead out from Core
trilead-api 2.184 1.0.4

4
core/src/test/java/jenkins/plugins/DetachedPluginsUtilTest.java
View File

@ -11,8 +11,8 @@ import java.util.List;
import java.util.stream.Collectors;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.hasItems;
import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@ -40,7 +40,7 @@ public class DetachedPluginsUtilTest {
final List<DetachedPluginsUtil.DetachedPlugin> detachedPluginsSince2_161 =
DetachedPluginsUtil.getDetachedPlugins(new VersionNumber("2.161"));
assertThat(mapToPluginShortName(detachedPluginsSince2_161), contains("jaxb", "trilead-api"));
assertThat(mapToPluginShortName(detachedPluginsSince2_161), hasItems("jaxb", "trilead-api"));
}
}

3
pom.xml
View File

@ -113,6 +113,9 @@ THE SOFTWARE.
<access-modifier-checker.version>1.21</access-modifier-checker.version>
<junit.jupiter.version>5.7.1</junit.jupiter.version>
<powermock.version>2.0.9</powermock.version>
<!-- SSHD plugin version -->
<sshd.plugin.version>3.0.1</sshd.plugin.version>
</properties>
<!-- Note that the 'repositories' and 'pluginRepositories' blocks below are actually copy-pasted

6
test/pom.xml
View File

@ -137,6 +137,12 @@ THE SOFTWARE.
<!-- TODO define property for this and share with war/pom.xml-->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>sshd</artifactId>
<version>${sshd.plugin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>

1
test/src/test/java/jenkins/security/ClassFilterImplTest.java
View File

@ -157,7 +157,6 @@ public class ClassFilterImplTest {
@Issue("JENKINS-49543")
public void moduleClassesShouldBeWhitelisted() throws Exception {
ClassFilterImpl filter = new ClassFilterImpl();
filter.check("org.jenkinsci.main.modules.cli.auth.ssh.UserPropertyImpl");
filter.check("org.jenkinsci.modules.windows_slave_installer.WindowsSlaveInstaller");
filter.check("org.jenkinsci.main.modules.instance_identity.PageDecoratorImpl");
}

14
war/pom.xml
View File

@ -110,10 +110,6 @@ THE SOFTWARE.
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>instance-identity</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>ssh-cli-auth</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>slave-installer</artifactId>
@ -134,10 +130,6 @@ THE SOFTWARE.
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>systemd-slave-installer</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>sshd</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.ui</groupId>
<artifactId>handlebars</artifactId>
@ -393,6 +385,12 @@ THE SOFTWARE.
<version>2.3.0</version>
<type>hpi</type>
</artifactItem>
<artifactItem>
<groupId>org.jenkins-ci.modules</groupId>
<artifactId>sshd</artifactId>
<version>${sshd.plugin.version}</version>
<type>hpi</type>
</artifactItem>
<artifactItem>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>trilead-api</artifactId>