[21u Communication] JDK 21.0.2 changes pushed

[Kevin Rushforth]

Hi Christoph,

This was the result of a misunderstanding about the commit hash to use 
in the PR title when creating the Merge PR. The original merge commit, 
with hash 289f7a7ab6f5f6cdd46e6183083842a91f496f34, was in the PR 
branch, but was dropped by Skara because the PR title pointed to the 
parent of that commit and not to the merge commit itself. Skara then 
(correctly, given the title of the PR) dropped that Merge commit and 
produced an identical merge commit, but with a different hash. It will 
be easy to avoid this problem next time by using the right hash in the 
PR title.

-- Kevin


On 1/17/2024 1:05 AM, Langer, Christoph wrote:
> Hi Rob,
>
> thanks for your prompt response.
>
> I think it is ok to only push the final promotion tag. (At least for me.)
>
> One thing that I can see now is that the original (merge-)commit that was tagged jdk-21.0.2+13 in the bundle distributed via vuln-dev (e.g. https://github.com/openjdk/jdk21u/pull/432/commits/289f7a7ab6f5f6cdd46e6183083842a91f496f34) is different from the merge commit created by the merge PR that is now in the jdk21u repo (https://github.com/openjdk/jdk21u/commit/375769c6986866210a0f36aad580e3ac8e9eb068). Not sure whether Skara tools could be further improved to keep the original commit (hash) if possible?
>
> Thanks
> Christoph
>
>> -----Original Message-----
>> From: Robert Mckenna <rob.mckenna at oracle.com>
>> Sent: Mittwoch, 17. Januar 2024 00:04
>> To: Langer, Christoph <christoph.langer at sap.com>; jdk-updates-
>> dev at openjdk.org
>> Cc: Sergey Bylokhov <bylokhov at amazon.com>
>> Subject: Re: [21u Communication] JDK 21.0.2 changes pushed
>>
>> Hi Christoph,
>>
>> In fact, we hadn't forgotten to add these tags, but we do seem to have
>> underestimated the demand for them. Explanation:
>>
>> We have moved to a new process for merging the CPU content to the open
>> repo. Enhancements to skara have made it possible to merge this content via a
>> PR. This means that integrators no longer need direct push access to the master
>> repositories. (this is desirable for several reasons) Unfortunately as a result we
>> will no longer be able to push the tags directly either. Instead, what we have
>> decided to do is use skara to add the ga & +0 tags after the PR has been
>> integrated by commenting on the relevant commit. (e.g.
>> https://github.com/openjdk/jdk21u/commit/375769c6986866210a0f36aad580
>> e3ac8e9eb068)
>>
>> Sergey (cc'd) and I have just been discussing it and he requested the addition of
>> the final promotion tag too (in this case jdk-21.0.2+13) which I have just done.
>>
>> Adding the tags for all every promotion would be time consuming and error
>> prone so I don't currently intend to do that in the absence of any substantive
>> objections. We will have to rethink our new approach if this is a problem.
>>
>>      -Rob
>>
>>
>> ________________________________________
>> From: Langer, Christoph <christoph.langer at sap.com>
>> Sent: Tuesday 16 January 2024 22:11
>> To: Robert Mckenna; jdk-updates-dev at openjdk.org
>> Subject: [External] : RE: [21u Communication] JDK 21.0.2 changes pushed
>>
>> Hi Rob,
>>
>> looks like you forgot to also push the individual build tags (e.g. via git push --
>> follow-tags). Can you please publish them as well?
>>
>> Thanks
>> Christoph
>>
>>> -----Original Message-----
>>> From: jdk-updates-dev <jdk-updates-dev-retn at openjdk.org> On Behalf Of
>>> Robert Mckenna
>>> Sent: Dienstag, 16. Januar 2024 19:13
>>> To: jdk-updates-dev at openjdk.org
>>> Subject: [21u Communication] JDK 21.0.2 changes pushed
>>>
>>> 21.0.2 content has been pushed to
>>> https://eur03.safelinks.protection.outlook.com/?url=https%3A%2F%2Furld
>>>
>> efense.com%2Fv3%2F__https%3A%2F%2Fgithub.com%2Fopenjdk%2Fjdk21u__
>> %3B!!
>>> ACWV5N9M2RV99hQ!PBdoWPD_UMqXDM-
>> 4XjLGKk6gypcsEc9jcPyuucDPsZEexHuVznQUip
>>> 4OEe5xRVdXl5s7XYpj00Gc_-
>> jihHIHBMtOhQ%24&data=05%7C02%7Cchristoph.lange
>> r%40sap.com%7Ccda56888f6fe472ea67008dc16e78355%7C42f7676cf455423
>> c82f6d
>> c2d99791af7%7C0%7C0%7C638410430790364473%7CUnknown%7CTWFpbG
>> Zsb3d8eyJWI
>> joiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C30
>> 00%7
>> C%7C%7C&sdata=e50ndmLOs9ZseITB9MhZURyyzeyC5cGIYIeowWb7%2FjY%3D
>> &reserve
>>> d=0
>>>
>>>      -Rob