[jta-dev] Syncing master with the commits from EE4J (may require force p

[Tom Jenkinson <tom.jenkinson@xxxxxxxxxx>]

Does anyone have a problem with me forcing master to use the commits from our EE4J branch?

master: https://github.com/eclipse-ee4j/jta-api/commits/master

EE4J: https://github.com/eclipse-ee4j/jta-api/commits/EE4J_8

Just to be clear I am thinking of:

git checkout master

git reset --hard upstream/EE4J

// a kind of git revert of the artifact version number change we did in "https://github.com/eclipse-ee4j/jta-api/commit/d8fb67f9f26b73e836afd924da272239dd3a7620" but move it to 1.4 rather than 1.4-SNAPSHOT

Once agreed, either try to merge the PR using github or git push upstream master -f

Any objections?

My pull request is over here: https://github.com/eclipse-ee4j/jta-api/pull/70 and the issue is https://github.com/eclipse-ee4j/jta-api/issues/44

Thanks,

Tom