From dc2ec9c57cd04e45d60c1eee35f49d92ff26489f Mon Sep 17 00:00:00 2001 From: monksy Date: Tue, 29 Aug 2023 16:31:12 -0500 Subject: [PATCH 1/8] Updated misisng command in readme --- README.md | 17 ++++-- pom.xml | 178 +++++++++++++++++++++++++++++------------------------- 2 files changed, 110 insertions(+), 85 deletions(-) diff --git a/README.md b/README.md index a118b9b..0c4206a 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,23 @@ -ssh-plugin +# ssh-plugin =========== -You can use the SSH Plugin to run shell commands on a remote machine via ssh. +## About + +This is a Jenkins plugin that allows for you to run operations with SSH. (I.e. commands, file management etc) + +## Usage Documentation and Examples More documentation available on the Jenkins wiki: https://wiki.jenkins-ci.org/display/JENKINS/SSH+Plugin -Contribute ------------- +## Building this project + +```shell +mvn install +``` + +## Contribute Fork and send a pull request (or create an issue on GitHub or in JIRA) diff --git a/pom.xml b/pom.xml index 094c31b..e00b9bf 100644 --- a/pom.xml +++ b/pom.xml @@ -1,94 +1,110 @@ - - 4.0.0 - Execute shell scripts on remote host -using ssh (pre and post build). -Based on the cool scp plugin. - - org.jenkins-ci.plugins - plugin - 1.609.3 - + + 4.0.0 + Execute shell scripts on remote host + using ssh (pre and post build). + Based on the cool scp plugin. + + + org.jenkins-ci.plugins + plugin + 4.71 + + + + 11 + 11 + 2.320 + + ssh + Jenkins SSH plugin + 2.7-SNAPSHOT + hpi + http://wiki.jenkins-ci.org/display/JENKINS/SSH+plugin - ssh - Jenkins SSH plugin - 2.7-SNAPSHOT - hpi - http://wiki.jenkins-ci.org/display/JENKINS/SSH+plugin + + + edmund_wagner + Edmund Wagner + + + ljader + Lukasz Jader + + - - - edmund_wagner - Edmund Wagner - - - ljader - Lukasz Jader - - - - - - org.jenkins-ci.plugins - jsch - 0.1.54.1 - + + + org.jenkins-ci.plugins + jsch + 0.1.55.61.va_e9ee26616e7 + org.jenkins-ci.plugins ssh-credentials - 1.12 + 277.v95c2fec1c047 - + - - - - maven-release-plugin - - deploy - - - - org.jenkins-ci.tools - maven-hpi-plugin - true - - 2.5 - - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + 11 + + + + maven-release-plugin + + deploy + + + + org.jenkins-ci.tools + maven-hpi-plugin + 3.36 + true + + 2.5 + + + + - - - maven.jenkins-ci.org - https://repo.jenkins-ci.org/releases/ - - - maven.jenkins-ci.org - https://repo.jenkins-ci.org/snapshots/ - - + + + maven.jenkins-ci.org + https://repo.jenkins-ci.org/releases/ + + + maven.jenkins-ci.org + https://repo.jenkins-ci.org/snapshots/ + + - - - - repo.jenkins-ci.org - https://repo.jenkins-ci.org/public/ - - + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + - - - repo.jenkins-ci.org - https://repo.jenkins-ci.org/public/ - - + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/releases/ + + - - scm:git:git@github.com:jenkinsci/ssh-plugin.git - scm:git:git@github.com:jenkinsci/ssh-plugin.git - HEAD - + + scm:git:git@github.com:jenkinsci/ssh-plugin.git + scm:git:git@github.com:jenkinsci/ssh-plugin.git + HEAD + From 77099138b115f22de9843bdd305817c982e5c51e Mon Sep 17 00:00:00 2001 From: monksy Date: Tue, 29 Aug 2023 16:37:29 -0500 Subject: [PATCH 2/8] Server target expects jdk8.. sigh. --- pom.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e00b9bf..a94d881 100644 --- a/pom.xml +++ b/pom.xml @@ -12,8 +12,6 @@ - 11 - 11 2.320 ssh @@ -53,7 +51,7 @@ maven-compiler-plugin 3.11.0 - 11 + 8 From 18b7fc355f094dcc4354a9235a28114e7f4604cb Mon Sep 17 00:00:00 2001 From: monksy Date: Tue, 29 Aug 2023 16:58:19 -0500 Subject: [PATCH 3/8] Min version 11. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a94d881..e8623e8 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ maven-compiler-plugin 3.11.0 - 8 + 11 From 14c05251344e3c3c02415d9bd6a539a5dca5e3dd Mon Sep 17 00:00:00 2001 From: monksy Date: Tue, 29 Aug 2023 18:49:04 -0500 Subject: [PATCH 4/8] Updating jenkins --- Jenkinsfile | 8 +++++++- pom.xml | 8 -------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f0bdcc9..3fad3f3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,10 @@ #!/usr/bin/env groovy /* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */ -buildPlugin() \ No newline at end of file +buildPlugin( + useContainerAgent: true, + configurations: [ + [platform: 'linux', jdk: 11], + [platform: 'linux', jdk: 17], + [platform: 'windows', jdk: 11], + ]) \ No newline at end of file diff --git a/pom.xml b/pom.xml index e8623e8..44da6ff 100644 --- a/pom.xml +++ b/pom.xml @@ -46,14 +46,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - 11 - - maven-release-plugin From d581b2bd1086bd2cb4e8de8cd6a4d6e4c147d17a Mon Sep 17 00:00:00 2001 From: monksy Date: Tue, 29 Aug 2023 19:00:03 -0500 Subject: [PATCH 5/8] added in comment to kick off build. --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 44da6ff..c7678f1 100644 --- a/pom.xml +++ b/pom.xml @@ -29,6 +29,10 @@ ljader Lukasz Jader + + monksy + Steven H + From ef13654fbf3bc99bafe2b8e23afe3d3c3cd216c8 Mon Sep 17 00:00:00 2001 From: monksy Date: Thu, 31 Aug 2023 00:44:31 -0500 Subject: [PATCH 6/8] Updated the jelly files. --- src/main/resources/index.jelly | 1 + .../org/jvnet/hudson/plugins/SSHBuildWrapper/config.jelly | 1 + .../org/jvnet/hudson/plugins/SSHBuildWrapper/global.jelly | 1 + .../resources/org/jvnet/hudson/plugins/SSHBuilder/config.jelly | 1 + 4 files changed, 4 insertions(+) diff --git a/src/main/resources/index.jelly b/src/main/resources/index.jelly index 17230b5..094279d 100644 --- a/src/main/resources/index.jelly +++ b/src/main/resources/index.jelly @@ -1,3 +1,4 @@ +
This plugin executes shell commands remotely using SSH protocol.
diff --git a/src/main/resources/org/jvnet/hudson/plugins/SSHBuildWrapper/config.jelly b/src/main/resources/org/jvnet/hudson/plugins/SSHBuildWrapper/config.jelly index 2bd6b4c..4ef5a00 100644 --- a/src/main/resources/org/jvnet/hudson/plugins/SSHBuildWrapper/config.jelly +++ b/src/main/resources/org/jvnet/hudson/plugins/SSHBuildWrapper/config.jelly @@ -1,3 +1,4 @@ + diff --git a/src/main/resources/org/jvnet/hudson/plugins/SSHBuildWrapper/global.jelly b/src/main/resources/org/jvnet/hudson/plugins/SSHBuildWrapper/global.jelly index e4cdc3a..cbb7a47 100644 --- a/src/main/resources/org/jvnet/hudson/plugins/SSHBuildWrapper/global.jelly +++ b/src/main/resources/org/jvnet/hudson/plugins/SSHBuildWrapper/global.jelly @@ -1,3 +1,4 @@ + diff --git a/src/main/resources/org/jvnet/hudson/plugins/SSHBuilder/config.jelly b/src/main/resources/org/jvnet/hudson/plugins/SSHBuilder/config.jelly index 2148173..aa6a2a8 100644 --- a/src/main/resources/org/jvnet/hudson/plugins/SSHBuilder/config.jelly +++ b/src/main/resources/org/jvnet/hudson/plugins/SSHBuilder/config.jelly @@ -1,3 +1,4 @@ + From 310019cdadc8dbcf69b8a7662541cbdf766ebf34 Mon Sep 17 00:00:00 2001 From: monksy Date: Thu, 31 Aug 2023 01:17:21 -0500 Subject: [PATCH 7/8] Moved it to unsecured for the plugin tests. --- .../credentialsForSameSiteAreMerged/config.xml | 7 ++----- .../loadAllThreePossibleSiteConfigs/config.xml | 7 ++----- .../loadConfigWorksFromOlder23Version/config.xml | 7 ++----- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/test/resources/org/jvnet/hudson/plugins/SSHBuildWrapperTest/credentialsForSameSiteAreMerged/config.xml b/src/test/resources/org/jvnet/hudson/plugins/SSHBuildWrapperTest/credentialsForSameSiteAreMerged/config.xml index 34cebd0..efd840b 100644 --- a/src/test/resources/org/jvnet/hudson/plugins/SSHBuildWrapperTest/credentialsForSameSiteAreMerged/config.xml +++ b/src/test/resources/org/jvnet/hudson/plugins/SSHBuildWrapperTest/credentialsForSameSiteAreMerged/config.xml @@ -1,13 +1,10 @@ - 1.609.3 + 2.320 1 NORMAL true - - hudson.model.Hudson.Read:anonymous - hudson.model.Item.Read:anonymous - + diff --git a/src/test/resources/org/jvnet/hudson/plugins/SSHBuildWrapperTest/loadAllThreePossibleSiteConfigs/config.xml b/src/test/resources/org/jvnet/hudson/plugins/SSHBuildWrapperTest/loadAllThreePossibleSiteConfigs/config.xml index 34cebd0..efd840b 100644 --- a/src/test/resources/org/jvnet/hudson/plugins/SSHBuildWrapperTest/loadAllThreePossibleSiteConfigs/config.xml +++ b/src/test/resources/org/jvnet/hudson/plugins/SSHBuildWrapperTest/loadAllThreePossibleSiteConfigs/config.xml @@ -1,13 +1,10 @@ - 1.609.3 + 2.320 1 NORMAL true - - hudson.model.Hudson.Read:anonymous - hudson.model.Item.Read:anonymous - + diff --git a/src/test/resources/org/jvnet/hudson/plugins/SSHBuildWrapperTest/loadConfigWorksFromOlder23Version/config.xml b/src/test/resources/org/jvnet/hudson/plugins/SSHBuildWrapperTest/loadConfigWorksFromOlder23Version/config.xml index 34cebd0..efd840b 100644 --- a/src/test/resources/org/jvnet/hudson/plugins/SSHBuildWrapperTest/loadConfigWorksFromOlder23Version/config.xml +++ b/src/test/resources/org/jvnet/hudson/plugins/SSHBuildWrapperTest/loadConfigWorksFromOlder23Version/config.xml @@ -1,13 +1,10 @@ - 1.609.3 + 2.320 1 NORMAL true - - hudson.model.Hudson.Read:anonymous - hudson.model.Item.Read:anonymous - + From d9be9a8344b399476b4b920f8a64bfa944e8b646 Mon Sep 17 00:00:00 2001 From: monksy Date: Thu, 31 Aug 2023 02:12:43 -0500 Subject: [PATCH 8/8] Removed author name --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index c7678f1..44da6ff 100644 --- a/pom.xml +++ b/pom.xml @@ -29,10 +29,6 @@ ljader Lukasz Jader - - monksy - Steven H -