search

jboss / mojarra

Fork of Mojarra
10 stars 41 forks source link

Update fork for JBoss builds #93

Closed jasondlee closed 2 years ago

jasondlee commented 2 years ago

I think that's fight, @fjuma. I have a local rebase off of upstream/master that makes quite a few changes. Not sure how best to handle that.

fjuma commented 2 years ago

I think that's fight, @fjuma. I have a local rebase off of upstream/master that makes quite a few changes. Not sure how best to handle that.

Since this branch is indeed based off 4.0.0-M6 and the 4.0.1-SNAPSHOT was just part of an extra commit where they bumped the version in the M6 branch, the 4.0.0.SP01-SNAPSHOT version here is fine. No need to incorporate the extra commits from master yet.

jasondlee commented 2 years ago

Since this branch is indeed based off 4.0.0-M6 and the 4.0.1-SNAPSHOT was just part of an extra commit where they bumped the version in the M6 branch, the 4.0.0.SP01-SNAPSHOT version here is fine. No need to incorporate the extra commits from master yet.

I compared the repo between the hash for the tag and the head of master and got mostly bug fixes, etc. I think, then, we can merge this PR to get the repo ready for work, then open another to get it up-to-date with master?

fjuma commented 2 years ago

Since this branch is indeed based off 4.0.0-M6 and the 4.0.1-SNAPSHOT was just part of an extra commit where they bumped the version in the M6 branch, the 4.0.0.SP01-SNAPSHOT version here is fine. No need to incorporate the extra commits from master yet.

I compared the repo between the hash for the tag and the head of master and got mostly bug fixes, etc. I think, then, we can merge this PR to get the repo ready for work, then open another to get it up-to-date with master?

Yeah, if it will be helpful to incorporate the latest commits that haven't been included in a tag yet, then you could open a follow up PR to incorporate them.

fjuma commented 2 years ago

@jasondlee Just to check, have you had a chance to take a look at our 3.0.0.SP04 fork to see if the extra commits that we had included there have now been merged upstream? Just wondering if there are still extra fixes that we should cherry-pick here.

fjuma commented 2 years ago

Another thing that would be good to check if you haven't already done so is the impl JAR to make sure that it really does only contain the impl classes.

jasondlee commented 2 years ago

@jasondlee Just to check, have you had a chance to take a look at our 3.0.0.SP04 fork to see if the extra commits that we had included there have now been merged upstream? Just wondering if there are still extra fixes that we should cherry-pick here.

I think I have, but I'll double check to be sure.

jasondlee commented 2 years ago

Another thing that would be good to check if you haven't already done so is the impl JAR to make sure that it really does only contain the impl classes.

Verified.

jasondlee commented 2 years ago

@jasondlee Just to check, have you had a chance to take a look at our 3.0.0.SP04 fork to see if the extra commits that we had included there have now been merged upstream? Just wondering if there are still extra fixes that we should cherry-pick here.

I think I have, but I'll double check to be sure.

I think we're good on the cherry picks.