Bump baseline to 2.387.1 (#1288)

jenkinsci · Mar 21, 2023 · cee0766 · cee0766
1 parent 93b198a
commit cee0766
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/job-dsl-plugin/pom.xml b/job-dsl-plugin/pom.xml
@@ -53,7 +53,7 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.361.x</artifactId>
+                <artifactId>bom-2.387.x</artifactId>
                 <version>1887.vda_d0ddb_c15c4</version>
                 <type>pom</type>
                 <scope>import</scope>
@@ -114,6 +114,13 @@
             <artifactId>vsphere-cloud</artifactId>
             <version>2.27</version>
             <optional>true</optional>
+            <exclusions>
+                <!-- TODO pending https://github.com/jenkinsci/vsphere-cloud-plugin/pull/135 -->
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jenkinsci.plugins</groupId>

diff --git a/job-dsl-plugin/src/test/resources/expected-dsl.json b/job-dsl-plugin/src/test/resources/expected-dsl.json
@@ -228,7 +228,10 @@
               "generated": true,
               "contextClass": "com.cloudbees.hudson.plugins.folder.computed.PeriodicFolderTrigger",
               "html": "<!--\n ~ The MIT License\n ~\n ~ Copyright (c) 2013, CloudBees, Inc.\n ~\n ~ Permission is hereby granted, free of charge, to any person obtaining a copy\n ~ of this software and associated documentation files (the \"Software\"), to deal\n ~ in the Software without restriction, including without limitation the rights\n ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n ~ copies of the Software, and to permit persons to whom the Software is\n ~ furnished to do so, subject to the following conditions:\n ~\n ~ The above copyright notice and this permission notice shall be included in\n ~ all copies or substantial portions of the Software.\n ~\n ~ THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n ~ THE SOFTWARE.\n -->\n<div>\n\n    <p>\n        Some kinds of folders are reindexed automatically and immediately upon receipt of an external event.\n        For example, a multi-branch project will recheck its SCM repository for new or removed or modified branches when it receives an SCM change notification.\n        (Push notification may be configured as per the SCM plugin used for each respective branch source.)\n        Such notifications can occasionally be unreliable, however, or Jenkins might not even be running to receive them.\n        In some cases no immediate notification is even possible, for example because Jenkins is behind a firewall and can only poll an external system.\n    <\/p>\n\n    <p>\n        This trigger allows for a periodic fallback, but when necessary.\n        If no indexing has been performed in the specified interval, then an indexing will be scheduled.\n        For example, in the case of a multi-branch project, if the source control system is not configured for push notification, set a short interval (most people will pick between 15 minutes and 1 hour).\n        If the source control system is configured for push notification, set an interval that corresponds to the maximum acceptable delay in the event of a lost push notification as the last commit of the day.\n        (Subsequent commits should trigger indexing anyway and result in the commit being picked up, so most people will pick between 4 hours and 1 day.)\n    <\/p>\n<\/div>",
-              "firstSentenceCommentText": "Some kinds of folders are reindexed automatically and immediately upon receipt of an external event."
+              "firstSentenceCommentText": "Some kinds of folders are reindexed automatically and immediately upon receipt of an external event.",
+              "plugin": {
+                "id": "cloudbees-folder"
+              }
             }
           ]
         },
@@ -694,7 +697,10 @@
               "generated": true,
               "contextClass": "org.jenkinsci.plugins.configfiles.maven.job.MvnSettingsProvider",
               "html": "<div>\n    select the provided settings.xml for this project\n<\/div>",
-              "firstSentenceCommentText": "select the provided settings.xml for this project"
+              "firstSentenceCommentText": "select the provided settings.xml for this project",
+              "plugin": {
+                "id": "config-file-provider"
+              }
             }
           ]
         },

diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@
         <revision>1.83</revision>
         <changelist>-SNAPSHOT</changelist>
         <gitHubRepo>jenkinsci/job-dsl-plugin</gitHubRepo>
-        <jenkins.version>2.361.4</jenkins.version>
+        <jenkins.version>2.387.1</jenkins.version>
         <!-- TODO fix violations -->
         <spotbugs.threshold>High</spotbugs.threshold>
     </properties>