add api for available backup list

.github/dependabot.yml

@@ -0,0 +1,14 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "maven" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+    # Add assignees
+    assignees:
+      - "StefanSpieker"

.gitignore

@@ -1,6 +1,12 @@
 /target
-/.settings
-/.classpath
-/.project
+/.settings
+/.classpath
+/.project
 /work
+/.idea/
 *~
+# IntelliJ project files
+*.iml
+*.iws
+*.ipr
+/.idea/*

Jenkinsfile

@@ -1,4 +1,10 @@
 #!/usr/bin/env groovy
 
 /* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
-buildPlugin()
+buildPlugin(
+  useContainerAgent: true,
+  configurations: [
+    [platform: 'linux', jdk: 11],
+    [platform: 'linux', jdk: 17],
+    [platform: 'windows', jdk: 11],
+])

README.md

@@ -2,19 +2,16 @@
 
 This plugin simply backs up the global and job specific configurations (not the archive or the workspace).
 
-**This plugin is up for adoption.** Want to help improve this plugin?
-[Click here to learn more](https://www.jenkins.io/doc/developer/plugin-governance/adopt-a-plugin/)!
-
 ## Why another backup plugin
 
 The [Backup Plugin](https://plugins.jenkins.io/backup/) only does manual backups and
 stores all data found in JENKINS\_HOME.  This is sometimes not practical because of time and disk
 space requirements and the fact that it can only be manually triggered.  *ThinBackup*s can be
-scheduled and only backs up the most vital configuration info.
+scheduled and only backs up the most vital configuration info. Furthermore the Backup Plugin is unmaintained for quite a while.
 
 ## Documentation
 
-This plugin adds another management link to "Manage Jenkins" called ThinBackup which looks like
+This plugin adds another management link to "Manage Jenkins" in the Tools section in newer Jenkins versions, called ThinBackup which looks like
 this:
 
 ![](images/ManagementLink.png)
@@ -110,6 +107,12 @@ so think carefully about it.  Once you decide to backup build results, also get
 backing up your build archives.  Once again, be careful with this option because it could be very
 **time consuming** and probably needs **a ton of disk space**!
 
+#### Backup next build number file
+If this option is enabled, the file `nextBuildNumber` will also be backed up.
+
+#### Backup 'config-history' folder
+If this option is enabled, the directory `config-history` will also be backed up. The plugin which creates this folder is the [Job Configuration History Plugin](https://plugins.jenkins.io/jobConfigHistory/). 
+
 #### Backup 'userContents'
 
 Jenkins provides a URL where you can put common data (e.g., static HTML, Tools, etc.).  You can
@@ -172,4 +175,4 @@ Please let us know if you have another option or feature for this plugin by ente
 write us an email.
 
 Before submitting a feature request or bug report, you can check if it has already been submitted by
-searching issues in JIRA categorized under the thin-backup-plugin component.
+searching issues in JIRA categorized under the thin-backup-plugin component or directly on the [plugin site](https://plugins.jenkins.io/jobConfigHistory/#issues)

pom.xml

@@ -3,13 +3,13 @@
 	<parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.43</version>
+        <version>4.51</version>
     </parent>
 
 	<groupId>org.jvnet.hudson.plugins</groupId>
 	<artifactId>thinBackup</artifactId>
 	<name>ThinBackup</name>
-	<version>1.11-SNAPSHOT</version>
+	<version>1.16-SNAPSHOT</version>
 	<packaging>hpi</packaging>
 
 	<licenses>
@@ -56,13 +56,18 @@
 			<organizationUrl>www.borland.com</organizationUrl>
 			<timezone>CET</timezone>
 		</developer>
+		<developer>
+			<id>StefanSpieker</id>
+			<name>Stefan Spieker</name>
+			<timezone>CET</timezone>
+		</developer>
 	</developers>
 
 	<scm>
 		<connection>scm:git:https://github.com/jenkinsci/thin-backup-plugin.git</connection>
 		<developerConnection>scm:git:https://[email protected]/jenkinsci/thin-backup-plugin.git</developerConnection>
 		<url>https://github.com/jenkinsci/thin-backup-plugin</url>
-		<tag>HEAD</tag>
+		<tag>thinBackup-1.12</tag>
 	</scm>
 
 	<repositories>
@@ -78,11 +83,23 @@
 		</pluginRepository>
 	</pluginRepositories>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>io.jenkins.tools.bom</groupId>
+				<artifactId>bom-2.346.x</artifactId>
+				<version>1763.v092b_8980a_f5e</version>
+				<scope>import</scope>
+				<type>pom</type>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-library</artifactId>
-			<version>1.3</version>
+			<version>2.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -95,24 +112,31 @@
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.4</version>
+			<version>2.11.0</version>
 		</dependency>
 		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-utils</artifactId>
-			<version>3.3.0</version>
-			<scope>test</scope>
+			<groupId>io.jenkins.plugins</groupId>
+			<artifactId>ionicons-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.jenkins-ci.plugins.pipeline-stage-view</groupId>
+			<artifactId>pipeline-rest-api</artifactId>
+			<version>2.10</version>
 		</dependency>
 	</dependencies>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<jenkins.version>1.651.3</jenkins.version>
-		<java.level>8</java.level>
-<!-- 		<jenkins-test-harness.version>2.13</jenkins-test-harness.version> -->
+		<jenkins.version>2.346.3</jenkins.version>
+		<!-- 		<jenkins-test-harness.version>2.13</jenkins-test-harness.version> -->
 	</properties>
 
 	<build>
@@ -125,14 +149,6 @@
 				</configuration>
 			</plugin>
 
-			<plugin>
-				<groupId>org.jenkins-ci.tools</groupId>
-				<artifactId>maven-hpi-plugin</artifactId>
-				<configuration>
-					<pluginFirstClassLoader>true</pluginFirstClassLoader>
-				</configuration>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -144,14 +160,14 @@
 							<goal>testCompile</goal>
 						</goals>
 						<configuration>
-							<source>1.8</source>
-							<target>1.8</target>
+							<source>11</source>
+							<target>11</target>
 						</configuration>
 					</execution>
 				</executions>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>11</source>
+					<target>11</target>
 				</configuration>
 			</plugin>
 

src/main/java/org/jvnet/hudson/plugins/thinbackup/ThinBackupMgmtLink.java

@@ -16,6 +16,19 @@
  */
 package org.jvnet.hudson.plugins.thinbackup;
 
+import com.cloudbees.workflow.util.ServeJson;
+import edu.umd.cs.findbugs.annotations.NonNull;
+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,17 +38,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.
@@ -55,7 +57,7 @@ public String getDisplayName() {
 
   @Override
   public String getIconFileName() {
-    return "package.png";
+    return "symbol-archive-outline plugin-ionicons-api";
   }
 
   @Override
@@ -71,7 +73,7 @@ public String getDescription() {
   public void doBackupManual(final StaplerRequest res, final StaplerResponse rsp) throws IOException {
     LOGGER.info("Starting manual backup.");
 
-    final Jenkins jenkins = Jenkins.getInstance();
+    final Jenkins jenkins = Jenkins.getInstanceOrNull();
     if (jenkins == null) {
       return;
     }
@@ -94,7 +96,7 @@ public void doRestore(final StaplerRequest res, final StaplerResponse rsp,
       @QueryParameter("restorePlugins") final String restorePlugins) throws IOException {
     LOGGER.info("Starting restore operation.");
 
-    final Jenkins jenkins = Jenkins.getInstance();
+    final Jenkins jenkins = Jenkins.getInstanceOrNull();
     if (jenkins == null) {
       return;
     }
@@ -140,8 +142,9 @@ public void doSaveSettings(final StaplerRequest res, final StaplerResponse rsp,
       @QueryParameter("backupAdditionalFiles") final boolean backupAdditionalFiles,
       @QueryParameter("backupAdditionalFilesRegex") final String backupAdditionalFilesRegex,
       @QueryParameter("waitForIdle") final boolean waitForIdle,
+      @QueryParameter("backupConfigHistory") final boolean backupConfigHistory,
       @QueryParameter("forceQuietModeTimeout") final String forceQuietModeTimeout) throws IOException {
-    Jenkins jenkins = Jenkins.getInstance();
+    Jenkins jenkins = Jenkins.getInstanceOrNull();
     if (jenkins == null) {
       return;
     }
@@ -159,6 +162,7 @@ public void doSaveSettings(final StaplerRequest res, final StaplerResponse rsp,
     plugin.setBackupBuildArchive(backupBuildArchive);
     plugin.setBackupBuildsToKeepOnly(backupBuildsToKeepOnly);
     plugin.setBackupUserContents(backupUserContents);
+    plugin.setBackupConfigHistory(backupConfigHistory);
     plugin.setBackupNextBuildNumber(backupNextBuildNumber);
     plugin.setBackupPluginArchives(backupPluginArchives);
     plugin.setBackupAdditionalFiles(backupAdditionalFiles);
@@ -179,4 +183,23 @@ public List<String> getAvailableBackups() {
     return Utils.getBackupsAsDates(new File(plugin.getExpandedBackupPath()));
   }
 
+
+  @ServeJson
+  public List<String> 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.
+   * <p>
+   *
+   * @return name of the desired category, one of the enum values of Category, e.g. {@code STATUS}.
+   * @since 2.226
+   */
+  @NonNull
+  public Category getCategory() {
+    return Category.TOOLS;
+
+  }
 }

src/main/java/org/jvnet/hudson/plugins/thinbackup/ThinBackupPeriodicWork.java

@@ -24,9 +24,10 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import hudson.model.AsyncPeriodicWork;
 import org.apache.commons.lang.StringUtils;
 import org.jvnet.hudson.plugins.thinbackup.backup.HudsonBackup;
-import org.jvnet.hudson.plugins.thinbackup.hudson.model.AsyncPeriodicWork;
+
 import org.jvnet.hudson.plugins.thinbackup.utils.Utils;
 
 import antlr.ANTLRException;
@@ -68,7 +69,7 @@ protected void execute(final TaskListener arg0) {
   }
 
   protected void backupNow(final BackupType type) {
-    final Jenkins jenkins = Jenkins.getInstance();
+    final Jenkins jenkins = Jenkins.getInstanceOrNull();
     if (jenkins == null) {
       return;
     }
@@ -83,7 +84,7 @@ protected void backupNow(final BackupType type) {
           LOGGER.fine("Wait until executors are idle to perform backup.");
           Utils.waitUntilIdleAndSwitchToQuietMode(plugin.getForceQuietModeTimeout(), TimeUnit.MINUTES);
         } else {
-          LOGGER.warning("Do not wait until jenkins/hudson is idle to perform backup. This could cause corrupt backups.");
+          LOGGER.warning("Do not wait until Jenkins is idle to perform backup. This could cause corrupt backups.");
         }
 
         new HudsonBackup(plugin, type).backup();
@@ -93,14 +94,14 @@ protected void backupNow(final BackupType type) {
     } catch (final IOException e) {
       final String msg = MessageFormat
           .format(
-              "Cannot perform a backup. Please be sure jenkins/hudson has write privileges in the configured backup path ''{0}''.",
+              "Cannot perform a backup. Please be sure Jenkins has write privileges in the configured backup path ''{0}''.",
               backupPath);
       LOGGER.log(Level.SEVERE, msg, e);
     } finally {
       if (!inQuietModeBeforeBackup) {
         jenkins.doCancelQuietDown();
       } else {
-        LOGGER.info("Backup process finished, but still in quiet mode as before. The quiet mode needs to be canceled manually, because it is not clear who is putting jenkins/hudson into quiet mode.");
+        LOGGER.info("Backup process finished, but still in quiet mode as before. The quiet mode needs to be canceled manually, because it is not clear who is putting Jenkins into quiet mode.");
       }
     }
   }