Merge branch 'master' into improve-project-settings

janfaracik · Sep 17, 2024 · 6406b9b · 6406b9b
2 parents 439ddec + 4b889e6
commit 6406b9b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -169,7 +169,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>net.java.dev.jna</groupId>
         <artifactId>jna</artifactId>
-        <version>5.14.0</version>
+        <version>5.15.0</version>
       </dependency>
       <dependency>
         <groupId>net.java.sezpoz</groupId>

diff --git a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
@@ -299,6 +299,10 @@ public ContextMenu from(ModelObjectWithContextMenu self, StaplerRequest2 request
             return from(self, request, response, "sidepanel");
         }
 
+        public ContextMenu from(ModelObjectWithContextMenu self, StaplerRequest request, StaplerResponse response) throws JellyException, IOException {
+            return from(self, StaplerRequest.toStaplerRequest2(request), StaplerResponse.toStaplerResponse2(response), "sidepanel");
+        }
+
         public ContextMenu from(ModelObjectWithContextMenu self, StaplerRequest2 request, StaplerResponse2 response, String view) throws JellyException, IOException {
             WebApp webApp = WebApp.getCurrent();
             final Script s = webApp.getMetaClass(self).getTearOff(JellyClassTearOff.class).findScript(view);

diff --git a/test/pom.xml b/test/pom.xml
@@ -118,7 +118,7 @@ THE SOFTWARE.
         <!-- requireUpperBoundDeps via matrix-project and junit -->
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>script-security</artifactId>
-        <version>1361.v913100720139</version>
+        <version>1362.v67dc1f0e1b_b_3</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -178,7 +178,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2265.v3da_49c8134d6</version>
+      <version>2270.v87a_0ea_b_54da_0</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

diff --git a/war/pom.xml b/war/pom.xml
@@ -299,7 +299,7 @@ THE SOFTWARE.
                   <!-- dependency of command-launcher, junit, matrix-project, and workflow-support -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>script-security</artifactId>
-                  <version>1361.v913100720139</version>
+                  <version>1362.v67dc1f0e1b_b_3</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>