Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RUN-2152: remove use of SSHTaskBuilder #23

Merged
merged 2 commits into from
Jan 18, 2024
Merged

RUN-2152: remove use of SSHTaskBuilder #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67175b0
remove use of SSHTaskBuilder
ltamaster Jan 17, 2024
211b7cc
use java 11 github actions
ltamaster Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
- name: Get Fetch Tags
run: git -c protocol.version=2 fetch --tags --progress --no-recurse-submodules origin
if: "!contains(github.ref, 'refs/tags')"
- name: Set up JDK 1.8
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 11
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: set up JDK 1.8
- name: set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 11
- name: Build with Gradle
run: ./gradlew build
- name: Get Release Version
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ defaultTasks 'clean','build'
apply plugin: 'java'
apply plugin: 'groovy'
apply plugin: 'idea'
sourceCompatibility = 1.8
sourceCompatibility = 1.11
ext.rundeckPluginVersion= '1.2'
ext.rundeckVersion= '3.3.x'
ext.pluginClassNames='com.plugin.sshjplugin.SSHJNodeExecutorPlugin,com.plugin.sshjplugin.SSHJFileCopierPlugin'
Expand Down Expand Up @@ -50,7 +50,7 @@ dependencies {
pluginLibs group: 'commons-io', name: 'commons-io', version: '2.6', ext: 'jar'
pluginLibs group: 'net.sf.expectit', name: 'expectit-core', version: '0.9.0'

implementation 'org.rundeck:rundeck-core:4.14.0-rc1-20230606'
implementation 'org.rundeck:rundeck-core:5.0.1-20240115'
implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.26'

testImplementation 'junit:junit:4.12'
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/com/plugin/sshjplugin/SSHJBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.dtolabs.rundeck.core.common.INodeEntry;
import com.dtolabs.rundeck.core.dispatcher.DataContextUtils;
import com.dtolabs.rundeck.core.tasks.net.SSHTaskBuilder;
import com.dtolabs.rundeck.plugins.PluginLogger;
import com.plugin.sshjplugin.model.*;
import org.apache.commons.lang.StringUtils;
Expand Down Expand Up @@ -114,7 +113,7 @@ public static SSHJScp buildMultiScp(
final String remotePath,
final SSHJConnection sshConnection, final PluginLogger logger
) throws
SSHTaskBuilder.BuilderException {
Exception {


final SSHJScp scp = new SSHJScp();
Expand All @@ -131,10 +130,10 @@ static void buildMultiScp(
final SSHJConnection sshConnection,
final PluginLogger logger
) throws
SSHTaskBuilder.BuilderException {
Exception {

if (null == files || files.size() == 0) {
throw new SSHTaskBuilder.BuilderException("files was not set");
throw new Exception("files was not set");
}

if (null == remotePath) {
Expand Down
Loading