Added demo for thinBackup (#2722)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.mvn/extensions.xml

@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.8</version>
+    <version>1.13</version>
   </extension>
 </extensions>

demos/thin-backup/README.md

@@ -0,0 +1,30 @@
+# Configure ThinBackup
+
+Requires `thin-backup` >= 2.0
+Basic configuration of [ThinBackup](https://plugins.jenkins.io/thinBackup/) plugin.
+
+## Sample configuration
+
+```yaml
+unclassified:
+  thinBackup:
+    backupAdditionalFiles: false
+    backupAdditionalFilesRegex: "^.*\\.(txt)$"
+    backupBuildArchive: false
+    backupBuildResults: true
+    backupBuildsToKeepOnly: false
+    backupConfigHistory: false
+    backupNextBuildNumber: false
+    backupPath: "c:\\temp\\thin-backup"
+    backupPluginArchives: false
+    backupUserContents: false
+    cleanupDiff: false
+    diffBackupSchedule: "0 12 * * 1-5"
+    excludedFilesRegex: "^.*\\.(log)$"
+    failFast: true
+    forceQuietModeTimeout: 120
+    fullBackupSchedule: "0 12 * * 1"
+    moveOldBackupsToZipFile: false
+    nrMaxStoredFull: -1
+    waitForIdle: true
+```

docs/features/configExport.md

@@ -3,7 +3,7 @@
 The plugin supports exporting existing configurations as YAML.
 This can be achieved with the following options:
 
-* Accessing the `http://[your_jenkins_url]/configuration-as-code/` URL as a Jenkins administrators and pressing `Download Configuration`
+* Accessing the `http://[your_jenkins_url]/configuration-as-code/` URL as a Jenkins administrator, and clicking `Export configuration`
 * Running the following in a Groovy script (not recommended, uses internal APIs):
 
       import io.jenkins.plugins.casc.ConfigurationAsCode
@@ -11,9 +11,8 @@ This can be achieved with the following options:
       ConfigurationAsCode.get().export(stream)
       println stream.toString()
 
-Export feature is **NOT** intended to offer a directly usable jenkins.yaml configuration. 
-It can be used for inspiration writing your own production-ready YAML, but be aware that export can be partial, 
-or fail for some components.
+Export may not offer a directly usable jenkins.yaml configuration.
+It is normally better when you copy the relevant sections you need instead of the entire file.
 
 ## Security notice
 
@@ -21,14 +20,14 @@ Jenkins configuration may include various sensitive information,
 including, but not limited to, credentials, secrets, administrative information about the instance and user personal data.
 The Configuration-as-Code plugin tracks secrets and represents them safely in the exported YAMLs,
 but it cannot prevent secrets from being exported in all cases.
-Ultimately, it is a responsibility of Jenkins administrators to ensure that the generated YAML files
+Ultimately, it is the responsibility of Jenkins administrators to ensure that the generated YAML files
 do not include sensitive information.
 
 See more information about the masking logic below.
 
 ## Data to be exported
 
-Currently the plugin does not have a way to define which data should be exported.
+The plugin does not have a way to define which data should be exported.
 The following data is exported:
 
 * System configuration under the _Manage Jenkins_ link 
@@ -36,8 +35,9 @@ The following data is exported:
 * Agent configurations
 * Views
 * Credentials
+* Users - Only if using the security realm "Jenkins’ own user database"
 
-Jobs and users are NOT exported by the plugin.
+The plugin does NOT export Jobs.
 
 ## Secret masking
 

integrations/pom.xml

@@ -13,14 +13,15 @@
   <properties>
     <!-- no need to be deployed during release, this is a test-only module -->
     <maven.deploy.skip>true</maven.deploy.skip>
-    <jenkins.version>2.504.1</jenkins.version>
+    <jenkins.baseline>2.516</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.479.x</artifactId>
+        <artifactId>bom-${jenkins.baseline}.x</artifactId>
         <version>${plugin-bom.version}</version>
         <type>pom</type>
         <scope>import</scope>
@@ -208,7 +209,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>jira</artifactId>
-      <version>3.15</version>
+      <version>3.19</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -314,6 +315,11 @@
       <version>2.0.3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jvnet.hudson.plugins</groupId>
+      <artifactId>thinBackup</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

integrations/src/test/java/io/jenkins/plugins/casc/ThinBackupTest.java

@@ -0,0 +1,47 @@
+package io.jenkins.plugins.casc;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import io.jenkins.plugins.casc.misc.ConfiguredWithReadme;
+import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithReadmeRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.plugins.thinbackup.ThinBackupPluginImpl;
+
+public class ThinBackupTest {
+
+    @Rule
+    public JenkinsConfiguredWithReadmeRule j = new JenkinsConfiguredWithReadmeRule();
+
+    @Test
+    @ConfiguredWithReadme("thin-backup/README.md")
+    public void configure_thinbackup() {
+        ThinBackupPluginImpl thinBackupPluginConfig = ThinBackupPluginImpl.get();
+        final String backupPath = thinBackupPluginConfig.getBackupPath();
+        // test strings
+        assertEquals("c:\\temp\\thin-backup", backupPath);
+        assertEquals("0 12 * * 1-5", thinBackupPluginConfig.getDiffBackupSchedule());
+        assertEquals("0 12 * * 1", thinBackupPluginConfig.getFullBackupSchedule());
+        assertEquals("^.*\\.(log)$", thinBackupPluginConfig.getExcludedFilesRegex());
+        assertEquals("^.*\\.(txt)$", thinBackupPluginConfig.getBackupAdditionalFilesRegex());
+        // test numbers
+        assertEquals(120, thinBackupPluginConfig.getForceQuietModeTimeout());
+        assertEquals(-1, thinBackupPluginConfig.getNrMaxStoredFull());
+        // test booleans
+        assertTrue(thinBackupPluginConfig.isWaitForIdle());
+        assertTrue(thinBackupPluginConfig.isBackupBuildResults());
+        assertTrue(thinBackupPluginConfig.isFailFast());
+
+        assertFalse(thinBackupPluginConfig.isCleanupDiff());
+        assertFalse(thinBackupPluginConfig.isMoveOldBackupsToZipFile());
+        assertFalse(thinBackupPluginConfig.isBackupBuildArchive());
+        assertFalse(thinBackupPluginConfig.isBackupPluginArchives());
+        assertFalse(thinBackupPluginConfig.isBackupUserContents());
+        assertFalse(thinBackupPluginConfig.isBackupConfigHistory());
+        assertFalse(thinBackupPluginConfig.isBackupAdditionalFiles());
+        assertFalse(thinBackupPluginConfig.isBackupNextBuildNumber());
+        assertFalse(thinBackupPluginConfig.isBackupBuildsToKeepOnly());
+    }
+}

integrations/src/test/resources/io/jenkins/plugins/casc/LDAPSecurityRealmTestNoSecretExpected.yml

@@ -2,7 +2,10 @@ cache:
   size: 100
   ttl: 30
 configurations:
-- inhibitInferRootDN: false
+- groupMembershipStrategy:
+    fromGroupSearch: {
+      }
+  inhibitInferRootDN: false
   rootDN: "dc=acme,dc=fr"
   server: "ldap.acme.com"
 disableMailAddressResolver: false

plugin/pom.xml

@@ -62,6 +62,10 @@
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>caffeine-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>commons-lang3-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>commons-text-api</artifactId>
@@ -81,7 +85,7 @@
     <dependency>
       <groupId>io.vavr</groupId>
       <artifactId>vavr</artifactId>
-      <version>0.10.6</version>
+      <version>0.10.7</version>
     </dependency>
     <dependency>
       <groupId>com.github.stefanbirkner</groupId>

plugin/src/main/java/io/jenkins/plugins/casc/Attribute.java

@@ -26,7 +26,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.accmod.AccessRestriction;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;

plugin/src/main/java/io/jenkins/plugins/casc/BaseConfigurator.java

@@ -33,7 +33,7 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.accmod.AccessRestriction;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.Beta;

plugin/src/main/java/io/jenkins/plugins/casc/ConfigurationAsCode.java

@@ -77,7 +77,7 @@ import jenkins.model.Jenkins;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.QueryParameter;
@@ -632,9 +632,6 @@ public class ConfigurationAsCode extends ManagementLink {
                     }
                     tuples.add(new NodeTuple(new ScalarNode(Tag.STR, entry.getKey(), null, null, PLAIN), valueNode));
                 }
-                if (tuples.isEmpty()) {
-                    return null;
-                }
 
                 return new MappingNode(Tag.MAP, tuples, BLOCK);
 

plugin/src/main/java/io/jenkins/plugins/casc/ConfigurationContext.java

@@ -7,7 +7,7 @@ import io.jenkins.plugins.casc.model.CNode;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.kohsuke.stapler.Stapler;
 
 /**

plugin/src/main/java/io/jenkins/plugins/casc/Configurator.java

@@ -33,7 +33,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.Symbol;
 
 /**

plugin/src/main/java/io/jenkins/plugins/casc/SecretSourceResolver.java

@@ -16,7 +16,7 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringSubstitutor;
 import org.apache.commons.text.TextStringBuilder;
 import org.apache.commons.text.lookup.StringLookup;

plugin/src/main/java/io/jenkins/plugins/casc/core/HudsonPrivateSecurityRealmConfigurator.java

@@ -16,7 +16,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundConstructor;

plugin/src/main/java/io/jenkins/plugins/casc/impl/configurators/GlobalConfigurationCategoryConfigurator.java

@@ -16,13 +16,14 @@ import io.jenkins.plugins.casc.RootElementConfigurator;
 import io.jenkins.plugins.casc.model.CNode;
 import io.jenkins.plugins.casc.model.Mapping;
 import io.jenkins.plugins.casc.model.Scalar;
+import io.jenkins.plugins.casc.model.Sequence;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import jenkins.model.GlobalConfigurationCategory;
 import jenkins.model.Jenkins;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -109,6 +110,11 @@ public class GlobalConfigurationCategoryConfigurator extends BaseConfigurator<Gl
         Jenkins.get().getExtensionList(Descriptor.class).stream()
                 .filter(this::filterDescriptors)
                 .forEach(d -> describe(d, mapping, context));
+        mapping.entrySet()
+                .removeIf(e -> e.getValue() instanceof Mapping m
+                        && m.keySet().equals(Set.of("installations"))
+                        && m.get("installations") instanceof Sequence s
+                        && s.isEmpty());
         return mapping;
     }
 

plugin/src/main/java/io/jenkins/plugins/casc/impl/secrets/DockerSecretSource.java

@@ -8,7 +8,7 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * {@link SecretSource} implementation relying on <a href="https://docs.docker.com/engine/swarm/secrets">docker secrets</a>.

plugin/src/main/java/io/jenkins/plugins/casc/impl/secrets/EnvSecretSource.java

@@ -3,7 +3,7 @@ package io.jenkins.plugins.casc.impl.secrets;
 import hudson.Extension;
 import io.jenkins.plugins.casc.SecretSource;
 import java.util.Optional;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 

plugin/src/main/java/io/jenkins/plugins/casc/util/ExtraFieldUtils.java

@@ -19,16 +19,16 @@ package io.jenkins.plugins.casc.util;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import java.lang.reflect.Field;
 import java.util.Iterator;
-import org.apache.commons.lang.ClassUtils;
+import org.apache.commons.lang3.ClassUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
 /**
- * Extends {@link org.apache.commons.lang.reflect.FieldUtils} by adding
+ * Extends {@link org.apache.commons.lang3.reflect.FieldUtils} by adding
  * some utility methods.
  */
 @Restricted(NoExternalUse.class)
-public class ExtraFieldUtils extends org.apache.commons.lang.reflect.FieldUtils {
+public class ExtraFieldUtils extends org.apache.commons.lang3.reflect.FieldUtils {
 
     /**
      * Gets an accessible <code>Field</code> by name without breaking scope.

plugin/src/main/java/io/jenkins/plugins/casc/yaml/MergeStrategyFactory.java

@@ -4,7 +4,7 @@ import hudson.ExtensionList;
 import java.util.Optional;
 import javax.annotation.Nonnull;
 import jenkins.model.Jenkins;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class MergeStrategyFactory {
     private static MergeStrategy getMergeStrategy(@Nonnull String name) {

plugin/src/main/java/io/jenkins/plugins/casc/yaml/ModelConstructor.java

@@ -8,7 +8,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.map.AbstractMapDecorator;
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.constructor.AbstractConstruct;
 import org.yaml.snakeyaml.constructor.Construct;

plugin/src/main/resources/io/jenkins/plugins/casc/ConfigurationAsCode/index.jelly

@@ -2,8 +2,20 @@
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:st="jelly:stapler">
   <l:layout type="one-column" title="${%Configuration as Code}" permissions="${app.MANAGE_AND_SYSTEM_READ}">
   <l:main-panel>
-    <st:adjunct includes="io.jenkins.plugins.casc.assets.index"/>
-    <h1>${%Configuration as Code}</h1>
+    <l:app-bar title="${%Configuration as Code}">
+
+      <f:form method="post" action="reload" name="reload">
+        <l:hasAdministerOrManage>
+          <f:submit icon="symbol-refresh" primary="false" name="reload"
+            value="${%Reload existing configuration}"/>
+        </l:hasAdministerOrManage>
+      </f:form>
+      <f:form method="post" action="viewExport" name="viewExport">
+        <l:hasPermission permission="${app.SYSTEM_READ}">
+          <f:submit primary="false" name="viewExport" value="${%Export configuration}"/>
+        </l:hasPermission>
+      </f:form>
+    </l:app-bar>
 
     <j:choose>
       <j:when test="${empty it.sources}">
@@ -17,7 +29,7 @@
           </j:forEach>
         </ul>
 
-        <p>${%Last time applied :} <i:formatDate value="${it.lastTimeLoaded}" type="both" dateStyle="medium" timeStyle="long"/></p>
+        <p>${%Last time applied:} <i:formatDate value="${it.lastTimeLoaded}" type="both" dateStyle="medium" timeStyle="long"/></p>
 
       </j:otherwise>
     </j:choose>
@@ -25,7 +37,7 @@
     <l:isAdmin>
       <f:form method="post" action="replace" name="replace">
           <h2>${%Replace configuration source with:}</h2>
-          <f:entry title="${%Path or URL}" field="newSource" >
+          <f:entry title="${%Path or URL}" field="newSource" class="jenkins-form-item--small" >
               <f:textbox checkUrl="checkNewSource" checkDependsOn="newSource"/>
           </f:entry>
           <f:block>
@@ -33,25 +45,8 @@
           </f:block>
       </f:form>
     </l:isAdmin>
-    <h2>${%Actions}</h2>
 
-    <l:hasAdministerOrManage>
-      <f:form method="post" action="reload" name="reload">
-        <f:submit name="reload" value="${%Reload existing configuration}"/>
-      </f:form>
-    </l:hasAdministerOrManage>
     <l:hasPermission permission="${app.SYSTEM_READ}">
-      <f:form method="post" action="export" name="export">
-        <f:submit name="export" value="${%Download Configuration}"/>
-      </f:form>
-      <f:form method="post" action="viewExport" name="viewExport">
-        <f:submit name="viewExport" value="${%View Configuration}"/>
-      </f:form>
-      <div class="alert alert-warning clear-action-forms">
-        <l:icon class="icon-warning icon-sm"/>
-        ${%exportWarning}
-      </div>
-
       <h2>${%Reference}</h2>
       <dt>
         <dl><a href="reference">${%Documentation}</a></dl>

plugin/src/main/resources/io/jenkins/plugins/casc/ConfigurationAsCode/index.properties

@@ -1,3 +0,0 @@
-exportWarning=Export is not intended to offer a directly usable jenkins.yaml configuration. \
-  It can be used for inspiration writing your own, be aware export can be partial, \
-  or fail for some components.

plugin/src/main/resources/io/jenkins/plugins/casc/ConfigurationAsCode/reference.jelly

@@ -1,37 +1,17 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
-  <st:contentType value="text/html;charset=UTF-8"/>
-  <j:new var="h" className="hudson.Functions"/>
-  <j:invoke on="${h}" method="initPageVariables">
-    <j:arg value="${context}"/>
-  </j:invoke>
-  <html><head>
-  <link href='https://jenkins.io/assets/bower/bootstrap/css/bootstrap.min.css' media='screen' rel='stylesheet'/>
-  <link href='https://jenkins.io/assets/bower/tether/css/tether.min.css' media='screen' rel='stylesheet'/>
-  <link href='https://jenkins.io/css/font-icons.css' media='screen' rel='stylesheet'/>
-  <link href='https://jenkins.io/css/jenkins.css' media='screen' rel='stylesheet'/>
-  <link href='https://jenkins.io/assets/bower/ionicons/css/ionicons.min.css' media='screen' rel='stylesheet'/>
-  <link href='https://jenkins.io/css/footer.css' media='screen' rel='stylesheet'/>
-  <link href='https://jenkins.io/css/font-awesome.min.css' media='screen' rel='stylesheet'/>
-  <link href='${rootURL}/plugin/configuration-as-code/css/reference.css' rel='stylesheet'/>
-  </head>
-
-  <body class='syntax'>
-  <div class='container'>
-  <div class='row body'>
-  <div class='section'>
-  <h2>${%Jenkins Configuration as Code Reference}</h2>
-
-  <div class='sect3'>
-  <j:set var="casc" value="${it}"/>
-  <j:forEach items="${it.configurators}" var="c">
-    <st:include page="documentation.jelly" it="${c}" optional="true"/>
-  </j:forEach>
-  </div>
-  </div>
-  </div>
-  </div>
-  </body>
-  </html>
+<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:st="jelly:stapler">
+  <l:layout type="one-column" title="${%Reference}" permissions="${app.MANAGE_AND_SYSTEM_READ}">
+    <l:breadcrumb title="${%Reference}"/>
+    <l:main-panel>
+      <link href='${rootURL}/plugin/configuration-as-code/css/reference.css' rel='stylesheet'/>
+      <l:app-bar title="${%Reference}"/>
+      <div class='sect3'>
+        <j:set var="casc" value="${it}"/>
+        <j:forEach items="${it.configurators}" var="c">
+          <st:include page="documentation.jelly" it="${c}" optional="true"/>
+        </j:forEach>
+      </div>
+    </l:main-panel>
+  </l:layout>
 
 </j:jelly>

plugin/src/main/resources/io/jenkins/plugins/casc/ConfigurationAsCode/viewExport.jelly

@@ -1,10 +1,22 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:st="jelly:stapler" xmlns:p="/prism">
-  <l:layout type="one-column" title="${%Configuration as Code}">
-    <l:breadcrumb title="${%View}" />
+<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:st="jelly:stapler" xmlns:p="/prism"
+  xmlns:f="/lib/form">
+  <l:layout type="one-column" title="${%Exported configuration}">
+    <l:breadcrumb title="${%Exported configuration}" />
   <l:main-panel>
     <st:adjunct includes="io.jenkins.plugins.casc.assets.viewExport" />
 
+    <l:app-bar title="${%Exported configuration}">
+      <f:form method="post" action="export" name="export">
+        <f:submit icon="symbol-download" primary="false" name="export" value="${%Download}"/>
+      </f:form>
+    </l:app-bar>
+
+
+    <div class="jenkins-alert jenkins-alert-info">
+      ${%exportWarning}
+    </div>
+
     <p:prism configuration="${it.prismConfiguration}" />
     <pre>
       <code class="language-yaml">${export}</code>

plugin/src/main/resources/io/jenkins/plugins/casc/ConfigurationAsCode/viewExport.properties

@@ -0,0 +1,2 @@
+exportWarning=Export may not offer a directly usable jenkins.yaml configuration. \
+  It is normally better when you copy the relevant sections you need instead of the entire file.

plugin/src/main/resources/io/jenkins/plugins/casc/assets/index.css

@@ -1,26 +0,0 @@
-form[name='replace'] input[name='_.newSource'] {
-  width: 32em;
-}
-
-form[name='reload'] {
-  margin-bottom: 10px;
-}
-
-form[name='export'] {
-  float: left;
-  margin-right: 20px;
-  margin-bottom: 10px;
-}
-
-form[name='viewExport'] {
-  float: left;
-}
-
-td {
-  vertical-align: middle;
-}
-
-.clear-action-forms {
-  margin-top: 10px;
-  clear: both;
-}

plugin/src/main/webapp/css/reference.css

@@ -8,13 +8,13 @@
 
 .configurator-pointer {
   font-size: 0.5em;
-  color: #454545;
+  color: var(--text-color-secondary);
   font-weight: 100;
 }
 
 .root-configurator-pointer {
   font-size: 0.5em;
-  color: #7f5200;
+  color: var(--orange);
   font-weight: 100;
 }
 
@@ -27,7 +27,7 @@
   display: flex;
   flex-grow: 1;
   margin-left: 25px;
-  border-left: 1px solid #ccc;
+  border-left: var(--jenkins-border);
   line-height: 24px;
 }
 
@@ -70,7 +70,7 @@
 }
 
 .attribute-type {
-  color: #454545;
+  color: var(--text-color-secondary);
 }
 
 .attribute-type__list {

plugin/src/test/java/io/jenkins/plugins/casc/permissions/Action.java

@@ -1,8 +1,7 @@
 package io.jenkins.plugins.casc.permissions;
 
 public enum Action {
-    VIEW_CONFIGURATION("View Configuration"),
-    DOWNLOAD_CONFIGURATION("Download Configuration"),
+    VIEW_CONFIGURATION("Export configuration"),
     APPLY_NEW_CONFIGURATION("Apply new configuration"),
     RELOAD_EXISTING_CONFIGURATION("Reload existing configuration"),
     ;

plugin/src/test/java/io/jenkins/plugins/casc/permissions/PermissionsTest.java

@@ -1,7 +1,6 @@
 package io.jenkins.plugins.casc.permissions;
 
 import static io.jenkins.plugins.casc.permissions.Action.APPLY_NEW_CONFIGURATION;
-import static io.jenkins.plugins.casc.permissions.Action.DOWNLOAD_CONFIGURATION;
 import static io.jenkins.plugins.casc.permissions.Action.RELOAD_EXISTING_CONFIGURATION;
 import static io.jenkins.plugins.casc.permissions.Action.VIEW_CONFIGURATION;
 import static java.lang.String.format;
@@ -62,7 +61,6 @@ class PermissionsTest {
                 SYSTEM_READER,
                 ImmutableMap.<Action, Boolean>builder()
                         .put(VIEW_CONFIGURATION, true)
-                        .put(DOWNLOAD_CONFIGURATION, true)
                         .put(APPLY_NEW_CONFIGURATION, false)
                         .put(RELOAD_EXISTING_CONFIGURATION, false)
                         .build());
@@ -106,7 +104,6 @@ class PermissionsTest {
                 ADMIN,
                 ImmutableMap.<Action, Boolean>builder()
                         .put(VIEW_CONFIGURATION, true)
-                        .put(DOWNLOAD_CONFIGURATION, true)
                         .put(APPLY_NEW_CONFIGURATION, true)
                         .put(RELOAD_EXISTING_CONFIGURATION, true)
                         .build());

pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>5.16</version>
+    <version>5.26</version>
     <relativePath />
   </parent>
 
@@ -42,7 +42,7 @@
     <jenkins.baseline>2.504</jenkins.baseline>
     <jenkins.version>${jenkins.baseline}.1</jenkins.version>
     <tagNameFormat>configuration-as-code-@{project.version}</tagNameFormat>
-    <plugin-bom.version>4710.v016f0a_07e34d</plugin-bom.version>
+    <plugin-bom.version>5294.va_d2e144c80e1</plugin-bom.version>
     <spotless.check.skip>false</spotless.check.skip>
   </properties>
 
@@ -71,7 +71,7 @@
             <dependency>
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>10.23.1</version>
+              <version>11.1.0</version>
             </dependency>
           </dependencies>
         </plugin>

test-harness/pom.xml

@@ -32,7 +32,7 @@
     <dependency>
       <groupId>com.github.erosb</groupId>
       <artifactId>everit-json-schema</artifactId>
-      <version>1.14.5</version>
+      <version>1.14.6</version>
     </dependency>
     <dependency>
       <groupId>com.github.stefanbirkner</groupId>
@@ -49,6 +49,12 @@
       <groupId>com.vladsch.flexmark</groupId>
       <artifactId>flexmark-all</artifactId>
       <version>0.64.8</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jetbrains</groupId>
+          <artifactId>annotations</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>io.jenkins</groupId>

test-harness/src/main/java/io/jenkins/plugins/casc/misc/JenkinsConfiguredWithCodeRule.java

@@ -10,7 +10,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import org.apache.commons.lang.StringUtils;
 import org.hamcrest.core.StringContains;
 
 /**
@@ -49,7 +48,8 @@ public class JenkinsConfiguredWithCodeRule extends JenkinsConfiguredRule {
                 if (!configuredWithCode.expected().isInstance(t)) {
                     throw new AssertionError("Unexpected exception ", t);
                 } else {
-                    if (!StringUtils.isBlank(configuredWithCode.message())) {
+                    if (configuredWithCode.message() != null
+                            && !configuredWithCode.message().isBlank()) {
                         boolean match = new StringContains(false, configuredWithCode.message()).matches(t.getMessage());
                         if (!match) {
                             throw new AssertionError("Exception did not contain the expected string: "

test-harness/src/main/java/io/jenkins/plugins/casc/misc/JenkinsConfiguredWithReadmeRule.java

@@ -28,7 +28,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import org.apache.commons.lang.StringUtils;
 import org.hamcrest.core.StringContains;
 
 /**
@@ -73,7 +72,8 @@ public class JenkinsConfiguredWithReadmeRule extends JenkinsConfiguredRule {
                 if (!configuredWithReadme.expected().isInstance(t)) {
                     throw new AssertionError("Unexpected exception ", t);
                 } else {
-                    if (!StringUtils.isBlank(configuredWithReadme.message())) {
+                    if (configuredWithReadme.message() != null
+                            && !configuredWithReadme.message().isBlank()) {
                         boolean match =
                                 new StringContains(false, configuredWithReadme.message()).matches(t.getMessage());
                         if (!match) {