Skip to content
This repository was archived by the owner on Jun 20, 2022. It is now read-only.

Commit ea81f06

Browse files
committed
Delete non-exec-based agent factories
1 parent 8037497 commit ea81f06

File tree

10 files changed

+3
-880
lines changed

10 files changed

+3
-880
lines changed

pom.xml

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<groupId>org.jenkins-ci.plugins</groupId>
3131
<artifactId>plugin</artifactId>
32-
<version>4.12</version>
32+
<version>4.16</version>
3333
<relativePath />
3434
</parent>
3535

@@ -78,21 +78,6 @@
7878

7979
<dependencies>
8080
<!-- regular dependencies -->
81-
<dependency>
82-
<groupId>org.apache.sshd</groupId>
83-
<artifactId>sshd-core</artifactId>
84-
<version>1.7.0</version>
85-
</dependency>
86-
<dependency>
87-
<groupId>tomcat</groupId>
88-
<artifactId>tomcat-apr</artifactId>
89-
<version>5.5.23</version>
90-
</dependency>
91-
<dependency>
92-
<groupId>com.cloudbees.util</groupId>
93-
<artifactId>jnr-unixsocket-nodep</artifactId>
94-
<version>0.3.1</version>
95-
</dependency>
9681
<dependency>
9782
<groupId>org.jenkins-ci.plugins.workflow</groupId>
9883
<artifactId>workflow-step-api</artifactId>
@@ -107,11 +92,6 @@
10792
<groupId>org.jenkins-ci.plugins</groupId>
10893
<artifactId>ssh-credentials</artifactId>
10994
</dependency>
110-
<dependency>
111-
<groupId>org.jenkins-ci.plugins</groupId>
112-
<artifactId>bouncycastle-api</artifactId>
113-
<version>2.16.3</version>
114-
</dependency>
11595
<!-- jenkins dependencies -->
11696
<!-- test dependencies -->
11797
<dependency>
@@ -142,7 +122,7 @@
142122
<dependency>
143123
<groupId>io.jenkins.tools.bom</groupId>
144124
<artifactId>bom-2.222.x</artifactId>
145-
<version>20</version>
125+
<version>26</version>
146126
<scope>import</scope>
147127
<type>pom</type>
148128
</dependency>
@@ -152,13 +132,10 @@
152132
<build>
153133
<plugins>
154134
<plugin>
155-
<!-- critical because sshd needs to be loaded first, otherwise will just bail out -->
156-
<!-- https://www.jenkins.io/doc/developer/plugin-development/dependencies-and-class-loading/ -->
157135
<groupId>org.jenkins-ci.tools</groupId>
158136
<artifactId>maven-hpi-plugin</artifactId>
159137
<extensions>true</extensions>
160138
<configuration>
161-
<pluginFirstClassLoader>true</pluginFirstClassLoader>
162139
<compatibleSinceVersion>1.5</compatibleSinceVersion>
163140
</configuration>
164141
</plugin>

src/main/java/com/cloudbees/jenkins/plugins/sshagent/RemoteHelper.java

Lines changed: 0 additions & 61 deletions
This file was deleted.

src/main/java/com/cloudbees/jenkins/plugins/sshagent/SSHAgentStepExecution.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ private void initRemoteAgent() throws IOException, InterruptedException {
147147
listener.getLogger().println(Messages.SSHAgentBuildWrapper_UsingCredentials(SSHAgentBuildWrapper.description(userPrivateKey)));
148148
}
149149

150+
// TODO UI could be streamlined now that there is only one impl
150151
listener.getLogger().println("[ssh-agent] Looking for ssh-agent implementation...");
151152
Map<String, Throwable> faults = new LinkedHashMap<String, Throwable>();
152153
for (RemoteAgentFactory factory : Jenkins.getActiveInstance().getExtensionList(RemoteAgentFactory.class)) {

0 commit comments

Comments
 (0)