Fix binary compatibility for PullRequestSCMRevision.getPull (#817)

jenkinsci · Feb 28, 2024 · bbd5243 · bbd5243
1 parent 857269a
commit bbd5243
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -154,6 +154,11 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>com.infradna.tool</groupId>
+      <artifactId>bridge-method-annotation</artifactId>
+      <version>1.29</version>
+    </dependency>
   </dependencies>
 
   <repositories>
@@ -218,6 +223,18 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>com.infradna.tool</groupId>
+        <artifactId>bridge-method-injector</artifactId>
+        <version>1.29</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/PullRequestSCMRevision.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/PullRequestSCMRevision.java
@@ -24,8 +24,10 @@
 
 package com.cloudbees.jenkins.plugins.bitbucket;
 
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import jenkins.plugins.git.AbstractGitSCMSource;
+import jenkins.scm.api.SCMRevision;
 import jenkins.scm.api.mixin.ChangeRequestCheckoutStrategy;
 import jenkins.scm.api.mixin.ChangeRequestSCMRevision;
 
@@ -64,7 +66,7 @@ public PullRequestSCMRevision(@NonNull PullRequestSCMHead head, @NonNull Abstrac
      *
      * @return the pull revision.
      */
-    @NonNull
+    @NonNull @WithBridgeMethods(SCMRevision.class)
     public AbstractGitSCMSource.SCMRevisionImpl getPull() {
         return pull;
     }