1. Divergence in the history of master and EE4J_8 branches
means that generally SHA-1 hashes for commits for work on
Jakarta EE 8 are not present in master
I'm not a git expert. If I merge EE4J_8 with master, do all the
EE4J_8 commits go away and I can no longer refer to them by their
SHA-1?
I think it would depend on how the changes are made. For Jakarta Transactions, divergence was created even for the second respective commit on each of master and EE4J_8 branch:
I can certainly start doing that. I think we should address that at the Wiki article though, unless Jakarta Transactions is the only project not doing that and I misinterpreted https://wiki.eclipse.org/JakartaEE_New_Infra_Release_Job somehow.
You should be able to file a bug with Eclipse to get it
deleted if it's protected and you can't do it yourself.
The tags should apply to commits on master.
Tom Jenkinson wrote on 3/5/20 1:08 AM:
I tried to do it (although it is not my preference,
we should have the commits used by the tags, unless
they were to get lost later) but I have found that the
EE4J_8 branch is protected and I don't have the
permission to delete it. Perhaps other project repos
will have the same issue.
Mark Thomas wrote on 3/4/20 9:53 AM:
> On 04/03/2020 17:50, Mark Thomas wrote:
>> On 04/03/2020 17:04, Bill Shannon wrote:
>>> Here's my first guess at repos where the
EE4J_8 branch has not been merged:
>>
>> jsp-api, servlet-api, websocket-api and
el-api do not need to be merged.
>
> Whoops. el-ri
>
> Sorry for the noise.
>
> Mark
>
>>
>> Mark
>>
>>
>>>
>>> authentication: NOT MERGED
>>> authorization: NOT MERGED
>>> bvtck-porting: NOT MERGED
>>> cdi: NOT MERGED
>>> cdi-tck: NOT MERGED
>>> cditck-porting: NOT MERGED
>>> common-annotations-api: NOT MERGED
>>> concurrency-api: NOT MERGED
>>> concurrency-ri: NOT MERGED
>>> ditck-porting: NOT MERGED
>>> ejb-api: NOT MERGED
>>> enterprise-deployment: NOT MERGED
>>> glassfish-maven-embedded-plugin: NOT
MERGED
>>> glassfish-security-plugin: NOT MERGED
>>> grizzly: NOT MERGED
>>> grizzly-ahc: NOT MERGED
>>> grizzly-memcached: NOT MERGED
>>> grizzly-npn: NOT MERGED
>>> grizzly-thrift: NOT MERGED
>>> interceptor-api: NOT MERGED
>>> jakartaee-firstcup-examples: NOT MERGED
>>> jakartaee-schemas: NOT MERGED
>>> jakartaee-tutorial-examples: NOT MERGED
>>> jax-rpc-api: NOT MERGED
>>> jax-rpc-ri: NOT MERGED
>>> jax-ws-api: NOT MERGED
>>> jaxb-api: NOT MERGED
>>> jaxb-dtd-parser: NOT MERGED
>>> jaxb-fi: NOT MERGED
>>> jaxb-istack-commons: NOT MERGED
>>> jaxb-ri: NOT MERGED
>>> jaxb-stax-ex: NOT MERGED
>>> jaxr-api: NOT MERGED
>>> jaxr-ri: NOT MERGED
>>> jca-api: NOT MERGED
>>> jersey: NOT MERGED
>>> jms-api: NOT MERGED
>>> jpa-api: NOT MERGED
>>> jsonb-api: NOT MERGED
>>> jsonp: NOT MERGED
>>> jsp-api: NOT MERGED
>>> jstl-api: NOT MERGED
>>> jta-api: NOT MERGED
>>> jws-api: NOT MERGED
>>> management-api: NOT MERGED
>>> metro-jax-ws: NOT MERGED
>>> metro-jwsdp-samples: NOT MERGED
>>> metro-mimepull: NOT MERGED
>>> metro-package-rename-task: NOT MERGED
>>> metro-policy: NOT MERGED
>>> metro-saaj: NOT MERGED
>>> metro-ws-test-harness: NOT MERGED
>>> metro-wsit: NOT MERGED
>>> metro-xmlstreambuffer: NOT MERGED
>>> mojarra: NOT MERGED
>>> mojarra-jsf-extensions: NOT MERGED
>>> openmq: NOT MERGED
>>> orb: NOT MERGED
>>> orb-gmbal: NOT MERGED
>>> orb-gmbal-commons: NOT MERGED
>>> orb-gmbal-pfl: NOT MERGED
>>> saaj-api: NOT MERGED
>>> servlet-api: NOT MERGED
>>> soteria: NOT MERGED
>>> websocket-api: NOT MERGED
>>> yasson: NOT MERGED
>>>
>>>
>>> Bill Shannon wrote on 3/4/20 8:48 AM:
>>>> It turns out there's a *lot* of repos
that still have EE4J_8
>>>> branches. Here's the list:
>>>>
>>>> authentication
>>>> authorization
>>>> bvtck-porting
>>>> cdi
>>>> cdi-tck
>>>> cditck-porting
>>>> common-annotations-api
>>>> concurrency-api
>>>> concurrency-ri
>>>> ditck-porting
>>>> ejb-api
>>>> el-ri
>>>> enterprise-deployment
>>>> glassfish-maven-embedded-plugin
>>>> glassfish-security-plugin
>>>> grizzly
>>>> grizzly-ahc
>>>> grizzly-memcached
>>>> grizzly-npn
>>>> grizzly-thrift
>>>> interceptor-api
>>>> jakartaee-firstcup-examples
>>>> jakartaee-schemas
>>>> jakartaee-tutorial-examples
>>>> jax-rpc-api
>>>> jax-rpc-ri
>>>> jax-ws-api
>>>> jaxb-api
>>>> jaxb-dtd-parser
>>>> jaxb-fi
>>>> jaxb-istack-commons
>>>> jaxb-ri
>>>> jaxb-stax-ex
>>>> jaxr-api
>>>> jaxr-ri
>>>> jca-api
>>>> jersey
>>>> jms-api
>>>> jpa-api
>>>> jsonb-api
>>>> jsonp
>>>> jsp-api
>>>> jstl-api
>>>> jta-api
>>>> jws-api
>>>> management-api
>>>> metro-jax-ws
>>>> metro-jwsdp-samples
>>>> metro-mimepull
>>>> metro-package-rename-task
>>>> metro-policy
>>>> metro-saaj
>>>> metro-ws-test-harness
>>>> metro-wsit
>>>> metro-xmlstreambuffer
>>>> mojarra
>>>> mojarra-jsf-extensions
>>>> openmq
>>>> orb
>>>> orb-gmbal
>>>> orb-gmbal-commons
>>>> orb-gmbal-pfl
>>>> saaj-api
>>>> security-api
>>>> servlet-api
>>>> soteria
>>>> websocket-api
>>>> yasson
>>>>
>>>> I assume most of them have been
merged into master. (I could probably
>>>> figure that out with a bit more git
hacking.) But clearly people
>>>> aren't deleting them.
>>>>
>>>> Kevin Sutter wrote on 3/4/20 7:17 AM:
>>>>> Bill had suggested something
similar... But, my take is that most
>>>>> (all?) of the Projects were
already aware of this exercise and I
>>>>> consider JSTL a special case. If
this notice to the Spec Projects
>>>>> creates a lot of "of my, I forgot
to do that" type of comment, then I
>>>>> guess we'll have to be more
diligent. But, I really hope this was
>>>>> just a public service
announcement that the Projects can just say
>>>>> "been there, done that"...
>>>>>
>>>>>
---------------------------------------------------
>>>>> Kevin Sutter
>>>>> STSM, MicroProfile and Jakarta EE
architect @ IBM
>>>>> e-mail: sutter@xxxxxxxxxx
Twitter: @kwsutter
>>>>> phone: tl-553-3620 (office),
507-253-3620 (office)
>>>>> LinkedIn: https://urldefense.com/v3/__https://www.linkedin.com/in/kevinwsutter__;!!GqivPVa7Brio!IVruWGHy4fijAOikWKM7zkjC0i4ukly2pDNc5CuOE7Ww6OmhXBuj8QbpGpUd2UgTnA$
>>>>> <https://urldefense.com/v3/__https://www.linkedin.com/in/kevinwsutter__;!!GqivPVa7Brio!LAqjTVQEcglXU5s3uQ1-gMOOlBo4jlJRdxSN2WegAhmeX6fqhlwwJYwfJfQezBrdzQ$>
>>>>>
>>>>>
>>>>>
>>>>> From: Tom Jenkinson <tom.jenkinson@xxxxxxxxxx>
>>>>> To: JakartaEE Spec Project
Leadership discussions
>>>>> <jakartaee-spec-project-leads@xxxxxxxxxxx>
>>>>> Date: 03/04/2020 08:49
>>>>> Subject: [EXTERNAL] Re:
[jakartaee-spec-project-leads] Merging
>>>>> of EE4J_8 branches?
>>>>> Sent by: jakartaee-spec-project-leads-bounces@xxxxxxxxxxx
>>>>>
------------------------------------------------------------------------
>>>>>
>>>>>
>>>>>
>>>>> Do you want to track it somehow?
For instance, should we delete
>>>>> EE4J_8 branches (not my
preference) or add a note on a github project
>>>>> when it is complete?
>>>>>
>>>>> On Wed, 4 Mar 2020 at 14:29,
Kevin Sutter <_sutter@xxxxxx.com_
>>>>> <mailto:sutter@xxxxxxxxxx>>
wrote:
>>>>> Hi,
>>>>> Just a heads up... As we were
working through the JTSL project, we
>>>>> found that the old EE4J_8 project
was never properly merged with
>>>>> Master. Since this Project is
kind of an "orphan", I'm hoping that
>>>>> this is the only case of these
forgotten changes. We now have this
>>>>> project cleaned up and ready to
produce the Milestone API artifact.
>>>>> But, Bill and I thought it would
be a good idea to remind all of the
>>>>> Specification Projects to ensure
that any Jakarta EE 8 work was
>>>>> properly merged into Master
before getting too far down the Jakarta
>>>>> EE 9 path. Thanks!
>>>>>
>>>>>
---------------------------------------------------
>>>>> Kevin Sutter
>>>>> STSM, MicroProfile and Jakarta EE
architect @ IBM
>>>>> e-mail: _sutter@xxxxxx.com_
<mailto:sutter@xxxxxxxxxx>
Twitter:
>>>>> @kwsutter
>>>>> phone: tl-553-3620 (office),
507-253-3620 (office)
>>>>> LinkedIn: _https://urldefense.com/v3/__https://www.linkedin.com/in/kevinwsutter___;!!GqivPVa7Brio!IVruWGHy4fijAOikWKM7zkjC0i4ukly2pDNc5CuOE7Ww6OmhXBuj8QbpGpWs5EzBgw$
>>>>> <https://urldefense.com/v3/__https://www.linkedin.com/in/kevinwsutter__;!!GqivPVa7Brio!LAqjTVQEcglXU5s3uQ1-gMOOlBo4jlJRdxSN2WegAhmeX6fqhlwwJYwfJfQezBrdzQ$>
>>>>>
_______________________________________________
>>>>> jakartaee-spec-project-leads
mailing list_
>>>>>
__jakartaee-spec-project-leads@eclipse.org_
>>>>> <mailto:jakartaee-spec-project-leads@xxxxxxxxxxx>
>>>>> To change your delivery options,
retrieve your password, or
>>>>> unsubscribe from this list,
visit_
>>>>> __https://urldefense.com/v3/__https://www.eclipse.org/mailman/listinfo/jakartaee-spec-project-leads___;!!GqivPVa7Brio!IVruWGHy4fijAOikWKM7zkjC0i4ukly2pDNc5CuOE7Ww6OmhXBuj8QbpGpXi-JjLSw$
>>>>> <https://urldefense.com/v3/__https://www.eclipse.org/mailman/listinfo/jakartaee-spec-project-leads__;!!GqivPVa7Brio!LAqjTVQEcglXU5s3uQ1-gMOOlBo4jlJRdxSN2WegAhmeX6fqhlwwJYwfJfRkqKaK7w$>_______________________________________________
>>>>> jakartaee-spec-project-leads
mailing list
>>>>> jakartaee-spec-project-leads@xxxxxxxxxxx
>>>>> To change your delivery options,
retrieve your password, or
>>>>> unsubscribe from this list, visit
>>>>> https://urldefense.com/v3/__https://www.eclipse.org/mailman/listinfo/jakartaee-spec-project-leads__;!!GqivPVa7Brio!IVruWGHy4fijAOikWKM7zkjC0i4ukly2pDNc5CuOE7Ww6OmhXBuj8QbpGpWokqGLiw$
>>>>> <https://urldefense.com/v3/__https://www.eclipse.org/mailman/listinfo/jakartaee-spec-project-leads__;!!GqivPVa7Brio!LAqjTVQEcglXU5s3uQ1-gMOOlBo4jlJRdxSN2WegAhmeX6fqhlwwJYwfJfRkqKaK7w$>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
_______________________________________________
>>>>> jakartaee-spec-project-leads
mailing list
>>>>> jakartaee-spec-project-leads@xxxxxxxxxxx
>>>>> To change your delivery options,
retrieve your password, or unsubscribe from this list,
visit
>>>>> https://urldefense.com/v3/__https://www.eclipse.org/mailman/listinfo/jakartaee-spec-project-leads__;!!GqivPVa7Brio!LAqjTVQEcglXU5s3uQ1-gMOOlBo4jlJRdxSN2WegAhmeX6fqhlwwJYwfJfRkqKaK7w$
>>>>
>>>
>>>
>>>
_______________________________________________
>>> jakartaee-spec-project-leads mailing list
>>> jakartaee-spec-project-leads@xxxxxxxxxxx
>>> To change your delivery options, retrieve
your password, or unsubscribe from this list, visit
>>> https://urldefense.com/v3/__https://www.eclipse.org/mailman/listinfo/jakartaee-spec-project-leads__;!!GqivPVa7Brio!IVruWGHy4fijAOikWKM7zkjC0i4ukly2pDNc5CuOE7Ww6OmhXBuj8QbpGpWokqGLiw$
>>>
>>
>>
_______________________________________________
>> jakartaee-spec-project-leads mailing list
>> jakartaee-spec-project-leads@xxxxxxxxxxx
>> To change your delivery options, retrieve
your password, or unsubscribe from this list, visit
>> https://urldefense.com/v3/__https://www.eclipse.org/mailman/listinfo/jakartaee-spec-project-leads__;!!GqivPVa7Brio!IVruWGHy4fijAOikWKM7zkjC0i4ukly2pDNc5CuOE7Ww6OmhXBuj8QbpGpWokqGLiw$
>>
>
> _______________________________________________
> jakartaee-spec-project-leads mailing list
> jakartaee-spec-project-leads@xxxxxxxxxxx
> To change your delivery options, retrieve your
password, or unsubscribe from this list, visit
> https://urldefense.com/v3/__https://www.eclipse.org/mailman/listinfo/jakartaee-spec-project-leads__;!!GqivPVa7Brio!IVruWGHy4fijAOikWKM7zkjC0i4ukly2pDNc5CuOE7Ww6OmhXBuj8QbpGpWokqGLiw$
>
_______________________________________________
jakartaee-spec-project-leads mailing list jakartaee-spec-project-leads@xxxxxxxxxxx
To change your delivery options, retrieve your
password, or unsubscribe from this list, visit https://www.eclipse.org/mailman/listinfo/jakartaee-spec-project-leads