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

8251549: Update docs on building for Git #21

Closed
wants to merge 2 commits into from

Conversation

jddarcy
Copy link
Member

@jddarcy jddarcy commented Sep 5, 2020

8251549: Update docs on building for Git


Progress

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

Issue

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 5, 2020

👋 Welcome back darcy! 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
Copy link

openjdk bot commented Sep 5, 2020

@jddarcy The following labels 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 (add|remove) "label" command.

@openjdk openjdk bot added the build build-dev@openjdk.org label Sep 5, 2020
@jddarcy jddarcy changed the title Update docs on building for Git 8251549: Update docs on building for Git Sep 5, 2020
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 5, 2020
@mlbridge
Copy link

mlbridge bot commented Sep 5, 2020

Webrevs

Copy link
Contributor

@LanceAndersen LanceAndersen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Joe, This looks OK. Are similar changes being made to http://openjdk.java.net/guide/producingChangeset.html as well given it refers to mercurial?

@openjdk
Copy link

openjdk bot commented Sep 5, 2020

@jddarcy 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:

8251549: Update docs on building for Git

Reviewed-by: lancea

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 1143 new commits pushed to the master branch:

  • ae0ca74: 8247432: Update IANA Language Subtag Registry to Version 2020-09-29
  • 8ddf5e1: 8256809: Annotation processing causes NPE during flow analysis
  • aabc9ca: 8255678: Add Mutex::try_lock version without rank checks
  • 884b9ff: 8256485: Zero VM build broken after JDK-8254231
  • 84429cd: 8249144: Potential memory leak in TypedMethodOptionMatcher
  • 895cc4f: 8255675: Typo in java.net.HttpURLConnection
  • 5ed7044: 8256154: Some TestNG tests require default constructors
  • b0485b9: 8256240: Reproducible builds should turn on the "deterministic" flag for Visual Studio
  • 0fb31db: 8254231: Implementation of Foreign Linker API (Incubator)
  • 53f3835: 8256419: ZGC: Remove "Heap Used Before/After Mark/Relocation" samplers
  • ... and 1133 more: https://git.openjdk.java.net/jdk/compare/5d2e79e2c38ff79c1d5712aa77d5ac98eef9f97c...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 Pull request is ready to be integrated label Sep 5, 2020
@mlbridge
Copy link

mlbridge bot commented Sep 5, 2020

Mailing list message from John Paul Adrian Glaubitz on build-dev:

Hi Joe!

On 9/5/20 10:21 PM, Joe Darcy wrote:

Does that mean that OpenJDK development has officially moved to Github now?

And are all OpenJDK members becoming members of the OpenJDK Github project?

Thanks,
Adrian

--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer - glaubitz at debian.org
`. `' Freie Universitaet Berlin - glaubitz at physik.fu-berlin.de
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913

@mlbridge
Copy link

mlbridge bot commented Sep 5, 2020

Mailing list message from Joe Darcy on build-dev:

Hello Adrian,

On 9/5/2020 2:04 PM, John Paul Adrian Glaubitz wrote:

Hi Joe!

On 9/5/20 10:21 PM, Joe Darcy wrote:
Does that mean that OpenJDK development has officially moved to Github now?

And are all OpenJDK members becoming members of the OpenJDK Github project?

See the announcements about this transition, with instructions, on jdk-dev:

https://mail.openjdk.java.net/pipermail/jdk-dev/2020-August/004588.html
https://mail.openjdk.java.net/pipermail/jdk-dev/2020-September/004694.html

-Joe

Copy link
Member

@magicus magicus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall looks good, but please restore the recommendation to stick with Cygwin tools.

doc/building.md Outdated Show resolved Hide resolved
Co-authored-by: Magnus Ihse Bursie <mag@icus.se>
@jddarcy
Copy link
Member Author

jddarcy commented Nov 23, 2020

/integrate

@openjdk openjdk bot closed this Nov 23, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 23, 2020
@openjdk
Copy link

openjdk bot commented Nov 23, 2020

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

  • ae0ca74: 8247432: Update IANA Language Subtag Registry to Version 2020-09-29
  • 8ddf5e1: 8256809: Annotation processing causes NPE during flow analysis
  • aabc9ca: 8255678: Add Mutex::try_lock version without rank checks
  • 884b9ff: 8256485: Zero VM build broken after JDK-8254231
  • 84429cd: 8249144: Potential memory leak in TypedMethodOptionMatcher
  • 895cc4f: 8255675: Typo in java.net.HttpURLConnection
  • 5ed7044: 8256154: Some TestNG tests require default constructors
  • b0485b9: 8256240: Reproducible builds should turn on the "deterministic" flag for Visual Studio
  • 0fb31db: 8254231: Implementation of Foreign Linker API (Incubator)
  • 53f3835: 8256419: ZGC: Remove "Heap Used Before/After Mark/Relocation" samplers
  • ... and 1133 more: https://git.openjdk.java.net/jdk/compare/5d2e79e2c38ff79c1d5712aa77d5ac98eef9f97c...master

Your commit was automatically rebased without conflicts.

Pushed as commit 042734c.

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

openjdk-notifier bot referenced this pull request Nov 23, 2020
@jddarcy jddarcy deleted the 8251549 branch February 9, 2021 02:10
gnu-andrew pushed a commit to gnu-andrew/jdk that referenced this pull request Nov 23, 2022
openjdk#13 isn't a perfect revert of 0af22dc limited to SSLContextImpl.java and
SunJSSE.java, since it doesn't remove the SharedSecrets import. This was
already in this way in rh2020290-support_tls_1_3_in_fips.v1.patch, I'm
now realizing this when doing the OpenJDK 11 backport and retrying the
same approach in OpenJDK 17:
~~~
# Revert openjdk#13
git show 0bd5ca9 | git apply -R
# Redo openjdk#13 by reverting 0af22dc in SSLContextImpl.java and SunJSSE.java
git show 0af22dc |
  git apply -R --include=src/java.base/share/classes/sun/security/ssl/*
~~~

In openjdk#14, I forgot to delete the DHKF and DHKFLock static
variables from FIPSKeyImporter, which are no longer used,
see rh-openjdk#14 (comment).

Reviewed-by: @gnu-andrew
caojoshua added a commit to caojoshua/jdk that referenced this pull request May 8, 2023
gnu-andrew pushed a commit to gnu-andrew/jdk that referenced this pull request Aug 18, 2023
openjdk#13 isn't a perfect revert of 0af22dc limited to SSLContextImpl.java and
SunJSSE.java, since it doesn't remove the SharedSecrets import. This was
already in this way in rh2020290-support_tls_1_3_in_fips.v1.patch, I'm
now realizing this when doing the OpenJDK 11 backport and retrying the
same approach in OpenJDK 17:
~~~
# Revert openjdk#13
git show 0bd5ca9 | git apply -R
# Redo openjdk#13 by reverting 0af22dc in SSLContextImpl.java and SunJSSE.java
git show 0af22dc |
  git apply -R --include=src/java.base/share/classes/sun/security/ssl/*
~~~

In openjdk#14, I forgot to delete the DHKF and DHKFLock static
variables from FIPSKeyImporter, which are no longer used,
see rh-openjdk#14 (comment).

Reviewed-by: @gnu-andrew
openjdk-notifier bot pushed a commit that referenced this pull request Apr 15, 2024
* Even more review comments

* Re-write of atomic copy loops

* Change name of UnsafeCopyMemory{,Mark} to UnsafeMemory{Access,Mark}

* Only add a memory mark for byte unaligned fill
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

6 participants