Page History

...

1. Check the original JBS issue on https://bugs.openjdk.java.net/
   1. Carefully check linked issues whether there are follow-up fixes that need to be brought with the backport.
   2. If there are relevant issues that prevent a clean backport, consider backporting those first (within reason).
      
      
2. Create the backport:
   1. Option 1:
      1. Go to the link of the original commit in github and issue the /backport command: "/backport jdk11u-dev"
      2. Follow instructions of the bot
   2. Option 2 (assumes SKARA CLI tooling):
      1. "git backport --from https://github.com/openjdk/jdk/commit <commit-sha>". See the SKARA wiki for more info.

      2. Create a pull request at https://github.com/openjdk/jdk11u-dev
   3. Option 3:
      
      1. Use plain Git to create the change:
         1. "git fetch --no-tags https://github.com/openjdk/jdk/commit <commit-sha>"
         2. "git cherry-pick --no-commit <commit-sha>"
         3. "git commit -a -m "Backport <commit sha>"
      2. Create a pull request at https://github.com/openjdk/jdk11u-dev
         
3. Test the patch
   1. "tier1" tests should be passing at all times, use "make run-test TEST=tier1" to run
   2. "tier2" provides a larger coverage, if you have resources to run it. Use "make run-test TEST=tier2" to run
   3. Run tests from the area that the patch affects, use "make run-test TEST=<path-to-tests>" to run specific tests
   4. New regression tests that come with the patch should pass
      
      
4. If (and only if) the original patch was modified, get the change reviewed
   1. Note: the change review is not the approval, which you would get at the next step
   2. It is advised to do the review at the jdk-updates-dev mailing list and optionally cc the original mailing list.
   3. The review request should be clearly marked as such: "[11u] RFR <original-bug-id>: <synopsis>". If using backport pull requests this will be automatic.
   4. It is helpful to state what changes were needed and why: the difference against original patch, motivations for doing things differently, etc.

   Code Block
   title Example RFR message collapse true
   Subject: [11u] RFR 8888888: My Hovercraft Is Full Of Eels Hi, Original bug:   https://bugs.openjdk.java.net/browse/JDK-8888888   https://hg.openjdk.java.net/jdk/jdk/rev/88888888 Original patch does not apply cleanly to 11u, because eels are all different sizes and shapes. Notably, I had to change the com/antioch/holy/Grenade.cpp to avoid API that only exists in 12+. 11u webrev:   https://cr.openjdk.java.net/~monty/8888888/webrev.01/ Testing: x86_64 build, affected tests, tier1 Thanks, -Monty

5. Request and await approval for the fix (if the issue is not public, go to step 8 first)
   
   1. Put the jdk11u-fix-request label and add a "Fix Request" comment on the issue, that explains why the fix should be backported, contains the link to the backport RFR (if applicable at step 5), the dependencies on other backports (if any),  shows what testing was done to verify the backport, gives a risk estimate, etc. The goal for the "Fix Request" comment is to give maintainers all the information about the backport to make an informed decision for inclusion into the update release.

   2. Wait for maintainer approval, which would manifest as jdk11u-fix-yes label on the issue.
      
      

   Code Block
   title Example Fix Request comment with RFR collapse true
   Fix Request Backporting this patch eliminates the critical eel overflow. Patch does not apply cleanly to 11u and requires adjustments. Backport requires JDK-8423421 and JDK-8771177 to be applied first. 11u RFR: http://mail.openjdk.java.net/pipermail/holy-grail-dev/2019-August/00001.html

   Code Block
   title Example Fix Request comment without RFR collapse true
   Fix Request Backporting this patch eliminates the critical eel overflow. Patch applies cleanly to 11u. New test fails without the product patch, and passes with it. Backport requires JDK-8423421 and JDK-8771177 to be applied first. tier1 and tier2 tests pass with the patch.

6. What if the change needs a CSR?
   1. From the original JBS issue, create a backport JBS issue ("More"→"Create Backport"). Target the backport issue to 11-pool. This issue will be resolved when the change is pushed.
   2. From that 11-pool  JBS issue, create a new CSR and copy/paste the contents from the original CSR. If the CSR is a straight copy of the original CSR, say so clearly in the issue text, otherwise point out differences. The new CSR should also have version 11-pool. 
   3. Run the CSR through its process to get it approved.
      
      
7.  What if the change you want to downport is not public?
   1. Sometimes a change you want to downport is not public in JBS. This means you can see the change and its JBS ID in the Git repository, but you will not find the corresponding issue in JBS.
   2. In such a case, you have to create the corresponding backport issue manually, according to the following recipe:
   3. Create a new issue in JBS with type "Bug" (you can't directly create an issue of type "Backport")
   4. The new issue should have exactly the same summary like the original change. You can take this from the Git "summary" line by stripping the prefixed Bug ID.
   5. It's helpful if the bug description contains a link to the original commit.
   6. Affected version should be one of "8", "11", ...
   7. Under "Linked issues" choose "backport of" and enter the bug id of the change you want to downport into the "Issue" filed (in the format "JDK-XXXXXXX").
   8. Once you've filled out all the other fields, press "Create" and once the issue has been created, edit the issue "Type" and change it from "Bug" to "Backport".
   9. Continue as usual at step 2.
      
      
8. If and only if everything is approved, push the change. This is done using the /integrate command of SKARA on the backport pull request. If you are not an jdk-updates project committer you'll need a committer to sponsor the PR for you.

...