Merge branch 'master' into JENKINS-74057

jenkinsci · Nov 8, 2024 · 7a86989 · 7a86989
2 parents affe348 + 313a0aa
commit 7a86989
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -28,10 +28,10 @@
     <properties>
         <revision>2.0.3</revision>
         <changelist>-SNAPSHOT</changelist>
-        <jenkins.version>2.414.3</jenkins.version>
+        <jenkins.version>2.452.3</jenkins.version>
         <gitHubRepo>jenkinsci/${project.artifactId}</gitHubRepo>
         <code.coverage.percentage>50</code.coverage.percentage>
-        <selenium.version>4.25.0</selenium.version>
+        <selenium.version>4.26.0</selenium.version>
         <!-- TODO fix existing violations -->
         <spotbugs.threshold>High</spotbugs.threshold>
     </properties>
@@ -52,8 +52,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.414.x</artifactId>
-                <version>2982.vdce2153031a_0</version>
+                <artifactId>bom-2.452.x</artifactId>
+                <version>3010.vec758b_8e7da_3</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/.../com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/configure-entries.jelly b/.../com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/configure-entries.jelly
@@ -56,11 +56,5 @@
         </f:entry>
     </f:section>
 
-    <script type="text/javascript">
-        // dropdownDescriptorSelectors will fill items up but don't update the layout, so need
-        // to do that explicitly
-        setTimeout(function(){
-            layoutUpdateCallback.call();
-        }, 500);
-    </script>
+    <st:adjunct includes="au.com.centrumsystems.hudson.plugin.buildpipeline.BuildPipelineView.layoutUpdateCallback-call"/>
 </j:jelly>
diff --git a/...centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/layoutUpdateCallback-call.js b/...centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/layoutUpdateCallback-call.js
@@ -0,0 +1,5 @@
+// dropdownDescriptorSelectors will fill items up but don't update the layout, so need
+// to do that explicitly
+setTimeout(function(){
+    layoutUpdateCallback.call();
+}, 500);
diff --git a/.../au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/main_dashboard.jelly b/.../au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/main_dashboard.jelly
@@ -4,9 +4,9 @@
     <link href="${rootURL}/plugin/build-pipeline-plugin/css/main_dashboard.css" type="text/css" rel="stylesheet" />
     <script type="text/javascript">
         // show/hide build details
-        $(function() {
-            $(".header").click(function() {
-                var parent = $(this).parent();
+        jQuery(document).ready(function() {
+            jQuery(".header").click(function() {
+                var parent = jQuery(this).parent();
                 var ba = parent.find(".build-actions");
                 var bb = parent.find(".build-body");