Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JDK-8261261: The version extra fields needs to be overridable in jib-profiles.js #2435

Closed
wants to merge 1 commit into from

Conversation

erikj79
Copy link
Member

@erikj79 erikj79 commented Feb 5, 2021

The Oracle internal file jib-profiles.js needs needs the getVersion function extended so that the extra1-3 fields can be overridden just like the existing version fields.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8261261: The version extra fields needs to be overridable in jib-profiles.js

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2435/head:pull/2435
$ git checkout pull/2435

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Feb 5, 2021

👋 Welcome back erikj! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr label Feb 5, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Feb 5, 2021

@erikj79 The following label will be automatically applied to this pull request:

  • build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the build label Feb 5, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Feb 5, 2021

Webrevs

magicus
magicus approved these changes Feb 8, 2021
Copy link
Member

@magicus magicus left a comment

Looks good to me.

@openjdk
Copy link

@openjdk openjdk bot commented Feb 8, 2021

@erikj79 This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8261261: The version extra fields needs to be overridable in jib-profiles.js

Reviewed-by: ihse

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 16 new commits pushed to the master branch:

  • d0a8f2f: 8260593: javac can skip a temporary local variable when pattern matching over a local variable
  • deb0544: 8261251: Shenandoah: Use object size for full GC humongous compaction
  • d45343e: 8260899: ARM32: SyncOnValueBasedClassTest fails with assert(is_valid()) failed: invalid register
  • 9d59dec: 8248876: LoadObject with bad base address created for exec file on linux
  • aa5bc6e: 8258953: AArch64: move NEON instructions to aarch64_neon.ad
  • c5ff454: 8250989: Consolidate buffer allocation code for CDS static/dynamic dumping
  • 0e18634: 8261270: MakeMethodNotCompilableTest fails with -XX:TieredStopAtLevel={1,2,3}
  • 7a2db85: 8261022: Fix incorrect result of Math.abs() with char type
  • 2c3a86f: 8261280: Remove THREAD argument from compute_loader_lock_object
  • 74d40ab: 8261200: Some code in the ICC_Profile may not close file streams properly
  • ... and 6 more: https://git.openjdk.java.net/jdk/compare/7a6c176845a0ae94faee411009e9fe2e2d74cdaa...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Feb 8, 2021
@erikj79
Copy link
Member Author

@erikj79 erikj79 commented Feb 8, 2021

/integrate

@openjdk openjdk bot closed this Feb 8, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Feb 8, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Feb 8, 2021

@erikj79 Since your change was applied there have been 25 commits pushed to the master branch:

  • 20d7713: 8261334: NMT: tuning statistic shows incorrect hash distribution
  • 92c6e6d: 8261254: Initialize charset mapping data lazily
  • 351d788: 8259074: regex benchmarks and tests
  • d6d5d9b: 8261231: Windows IME was disabled after DnD operation
  • 29a428f: 8261229: MethodData is not correctly initialized with TieredStopAtLevel=3
  • 48c932e: 8231286: HTML font size too large with high-DPI scaling and W3C_LENGTH_UNITS
  • dbc35f6: 8261094: Open javax/swing/text/html/CSS/4765271/bug4765271.java
  • db0ca2b: 8261161: Clean up warnings in hotspot/jtreg/vmTestbase tests
  • 2c28e36: 8237352: Update DatagramSocket to add support for joining multicast groups
  • d0a8f2f: 8260593: javac can skip a temporary local variable when pattern matching over a local variable
  • ... and 15 more: https://git.openjdk.java.net/jdk/compare/7a6c176845a0ae94faee411009e9fe2e2d74cdaa...master

Your commit was automatically rebased without conflicts.

Pushed as commit ab65d53.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build integrated
2 participants