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.

Sign up for GitHub

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

Jump to bottom

adoptopenjdk-bin: 11.0.1 -> 11.0.2 (hotspot aarch64-linux, x86_64-mac) #54576

Merged
merged 2 commits into from
Feb 17, 2019
Merged

adoptopenjdk-bin: 11.0.1 -> 11.0.2 (hotspot aarch64-linux, x86_64-mac) #54576

merged 2 commits into from
Feb 17, 2019

Conversation

taku0
Copy link
Contributor

@taku0 taku0 commented Jan 25, 2019

Motivation for this change
  • Security fixes
  • Other updates

https://www.oracle.com/technetwork/java/javase/11-0-2-relnotes-5188746.html
https://www.oracle.com/technetwork/security-advisory/cpujan2019-5072801.html#AppendixJAVA

Related: #54496

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Tested only on x86_64-mac.

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 labels Jan 25, 2019
@veprbl veprbl added 1.severity: security Issues which raise a security issue, or PRs that fix one 2.status: merge conflict This PR has merge conflicts with the target branch labels Jan 25, 2019
@veprbl veprbl changed the title adoptopenjdk-bin: 11.0.1 -> 11.0.2 (hotspot aarch64-linux, x86_64-mac) [Security fixes] adoptopenjdk-bin: 11.0.1 -> 11.0.2 (hotspot aarch64-linux, x86_64-mac) Jan 25, 2019
@Mic92
Copy link
Member

Mic92 commented Jan 26, 2019

Could you resolve the merge conflict?

@taku0
Copy link
Contributor Author

taku0 commented Jan 26, 2019

Rebased

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-linux: 0 This PR does not cause any packages to rebuild and removed 2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-linux: 1-10 labels Jan 26, 2019
@taku0
Copy link
Contributor Author

taku0 commented Jan 31, 2019

Updated OpenJ9 for macOS.

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-linux: 1-10 and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild labels Jan 31, 2019
@veprbl veprbl merged commit 8050d59 into NixOS:master Feb 17, 2019
pull bot pushed a commit to evanjs/nixpkgs that referenced this pull request Feb 17, 2019
@vcunat
Merge NixOS#54576: adoptopenjdk-bin: 11.0.1 -> 11.0.2
94b518f 
Includes security fixes.
vcunat added a commit that referenced this pull request Feb 17, 2019
@vcunat
Merge #54576: adoptopenjdk-bin: 11.0.1 -> 11.0.2
ef02c63 
Includes security fixes.

(cherry picked from commit 94b518f)
@veprbl
Copy link
Member

veprbl commented Feb 17, 2019

This is odd. I did put the labels and updated the title, but despite what github claims I did not merge this PR. @vcunat did you merge this? The merge commit 94b518f appears to be signed by you.

@vcunat
Copy link
Member

vcunat commented Feb 17, 2019

Yes, I pushed this. GitHub has been mis-attributing this kind of merges for a very long time. IIRC I had even written to their support.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@taku0 @Mic92 @veprbl @vcunat @GrahamcOfBorg