Re: [jakartaee-spec-project-leads] Merging of EE4J_8 branches?

["Kevin Sutter" <sutter@xxxxxxxxxx>]

I will point out
that not all of the EE4J_8 branches should be merged back into Master...
 Some projects abandoned the EE4J_8 branches once Master was opened
up.  Each project needs to determine whether the contents of EE4J_8
apply to Master or not and then delete the EE4J_8 branch when they are
done with it.

---------------------------------------------------
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://www.linkedin.com/in/kevinwsutter



From:
       Jonathan
Coustick <jonathan.coustick@xxxxxxxxxxx>
To:
       "jakartaee-spec-project-leads@xxxxxxxxxxx"
<jakartaee-spec-project-leads@xxxxxxxxxxx>
Date:
       03/04/2020
11:49
Subject:
       [EXTERNAL]
Re: [jakartaee-spec-project-leads] Merging of EE4J_8 branches?
Sent
by:        jakartaee-spec-project-leads-bounces@xxxxxxxxxxx

---

Hello,
I have done some comparisons based on
trying to make a PR on Github, and get the following:
authentication:  cannot merge automatically
authorization: cannot merge automatically
bvtck-porting: PR created
cdi: cannot merge automatically
cdi-tck: PR created
cdtck-porting: PR created
common-annotations-api: cannot merge automatically
concurrency-api: cannot merge automatically
concurrency-ri: cannot merge automatically
ditck-porting: already merged
ejb-api: cannot merge automatically
enterprise-deployment: cannot merge automatically
glassfish-maven-embedded-plugin: PR made
glassfish-security-plugin: no difference
grizzly: cannot merge automatically
grizzly-ahc: PR made and approved, just needs merging
grizzly-memcached: merged
grizzly-npn: cannot merge automatically
grizzly-thrift: merged
interceptor-api: merged
jakartaee-firstcup-examples: no changes on branch
jakartaee-schemas: PR made
jakartaee-tutorial-examples: no changed made on branch
jax-rpc-api: cannot merge automatically
jax-rpc-ri: cannot merge automatically
jax-ws-api: cannot merge automatically
jaxb-api: cannot merge automatically
jaxb-dtd-parser: cannot merge automatically
jaxb-fi: cannot merge automatically
jaxb-istack-commons: cannot merge automatically
jaxb-ri: cannot merge automatically
jaxb-stax-ex: cannot merge automatically
jaxr-api: cannot merge automatically
jca-api: cannot merge automatically
jersey: cannot merge automatically
jms-api: cannot merge automatically
jpa-api: cannot merge automatically
jsonb-api: cannot merge automatically
jsonp: cannot merge automatically
jsp-api: cannot merge automatically
jstl-api: cannot merge automatically
jws-api: cannot merge automatically
management-api: cannot merge automatically
metro-jax-ws: cannot merge automatically
metro-jwsdp-samples: no changes made on branch
metro-mimepull: cannot merge automatically
metro-package-rename-task
metro-policy: cannot merge automatically
metro-saaj: cannot merge automatically
metro-ws-test-harness: cannot merge automatically
metro-wsit: cannot merge automatically
metro-xmlstreambuffer: cannot merge automatically
mojarra: cannot merge automatically
mojarra-jsf-extensions - PR made
openmq: Merged (today)
orb: cannot merge automatically
orb-gmbal: cannot merge automatically
orb-gmbal-commons: cannot merge automatically
orb-gmbal-pfl: cannot merge automatically
saaj-api: cannot merge automatically
servlet-api: cannot merge automatically
soteria: cannot merge automatically
tyrus: cannot merge automatically
websocket-api: cannot merge automatically
yasson: cannot merge automatically 

Those that cannot be merged automatically
will require committers to resolve the conflicts between the two branches
in order to merge them.


Jonathan Coustick

On 04/03/2020 17:24, Tom Jenkinson wrote:
There should not be any more work required
on jta-api repo to take code from it's EE4J_8 branch: 
https://github.com/eclipse-ee4j/jta-api/pull/70/commitsvs https://github.com/eclipse-ee4j/jta-api/commits/EE4J_8


On Wed, 4 Mar 2020 at 17:08, Bill Shannon
<bill.shannon@xxxxxxxxxx>
wrote:
Here's my first guess at repos where
the EE4J_8 branch has not been merged:

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://www.linkedin.com/in/kevinwsutter



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@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@xxxxxxxxxx   Twitter:  @kwsutter
phone: tl-553-3620 (office), 507-253-3620 (office)    
LinkedIn: https://www.linkedin.com/in/kevinwsutter
_______________________________________________
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_______________________________________________
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




_______________________________________________
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://www.eclipse.org/mailman/listinfo/jakartaee-spec-project-leads

_______________________________________________
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
_______________________________________________
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