From 8df2b4bb31eb96b289a366ba1bd18c94d9611786 Mon Sep 17 00:00:00 2001 From: jxr98 Date: Sat, 25 Sep 2021 15:50:37 +0800 Subject: [PATCH 1/3] add api for available backup list --- .gitignore | 7 +++-- pom.xml | 5 ++++ .../thinbackup/ThinBackupMgmtLink.java | 28 +++++++++++-------- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index fbd2fffe..775aa083 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /target -/.settings -/.classpath -/.project +/.settings +/.classpath +/.project /work +/.idea/ *~ diff --git a/pom.xml b/pom.xml index cd8128d2..114cc5b6 100644 --- a/pom.xml +++ b/pom.xml @@ -106,6 +106,11 @@ 3.3.0 test + + org.jenkins-ci.plugins.pipeline-stage-view + pipeline-rest-api + 2.10 + diff --git a/src/main/java/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink.java b/src/main/java/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink.java index 433f45eb..7d33e48a 100644 --- a/src/main/java/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink.java +++ b/src/main/java/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink.java @@ -16,6 +16,18 @@ */ package org.jvnet.hudson.plugins.thinbackup; +import com.cloudbees.workflow.util.ServeJson; +import hudson.Extension; +import hudson.model.ManagementLink; +import hudson.model.TaskListener; +import jenkins.model.Jenkins; +import jenkins.util.Timer; +import org.jvnet.hudson.plugins.thinbackup.restore.HudsonRestore; +import org.jvnet.hudson.plugins.thinbackup.utils.Utils; +import org.kohsuke.stapler.QueryParameter; +import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerResponse; + import java.io.File; import java.io.IOException; import java.text.ParseException; @@ -25,18 +37,6 @@ import java.util.concurrent.TimeUnit; import java.util.logging.Logger; -import org.jvnet.hudson.plugins.thinbackup.restore.HudsonRestore; -import org.jvnet.hudson.plugins.thinbackup.utils.Utils; -import org.kohsuke.stapler.QueryParameter; -import org.kohsuke.stapler.StaplerRequest; -import org.kohsuke.stapler.StaplerResponse; - -import hudson.Extension; -import hudson.model.ManagementLink; -import hudson.model.TaskListener; -import jenkins.model.Jenkins; -import jenkins.util.Timer; - /** * A backup solution for Hudson. Backs up configuration files from Hudson and its jobs. * @@ -179,4 +179,8 @@ public List getAvailableBackups() { return Utils.getBackupsAsDates(new File(plugin.getExpandedBackupPath())); } + @ServeJson + public List doAvailableBackups(){ + return getAvailableBackups(); + } } From 24cdf41223750ac8b6171866e0b75c86c35e6046 Mon Sep 17 00:00:00 2001 From: jxr98 Date: Sat, 25 Sep 2021 15:50:37 +0800 Subject: [PATCH 2/3] add api for available backup list --- .../hudson/plugins/thinbackup/ThinBackupMgmtLink.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink.java b/src/main/java/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink.java index eabfb225..964fd278 100644 --- a/src/main/java/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink.java +++ b/src/main/java/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink.java @@ -39,8 +39,6 @@ import java.util.logging.Logger; - - /** * A backup solution for Hudson. Backs up configuration files from Hudson and its jobs. * @@ -187,9 +185,10 @@ public List getAvailableBackups() { @ServeJson - public List doAvailableBackups(){ + public List doAvailableBackups() { return getAvailableBackups(); - + } + /** * Name of the category for this management link. Exists so that plugins with core dependency pre-dating the version * when this was introduced can define a category. From 4d5c3912b56764da400996dfad2b6098de1db7e5 Mon Sep 17 00:00:00 2001 From: Xinrui Jiang Date: Wed, 18 Jan 2023 19:50:03 -0500 Subject: [PATCH 3/3] change Jenkins from 2.346.1 to 2.346.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 30935112..04c35271 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ UTF-8 - 2.346.1 + 2.346.3