Skip to content

update UseSuperTypeTest for jdk 21 #8446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 22, 2025
Merged

Conversation

homberghp
Copy link
Contributor

@homberghp homberghp commented Apr 23, 2025

Create expected code depending on JDK version

closes #8445

@homberghp homberghp changed the title solves issue 8445 solves issue 8445: test UseSuperTypeTest when ran on jdk >= 21 Apr 23, 2025
@homberghp homberghp changed the title solves issue 8445: test UseSuperTypeTest when ran on jdk >= 21 closes 8445: test UseSuperTypeTest when ran on jdk >= 21 Jun 13, 2025
@mbien mbien added Java [ci] enable extra Java tests (java.completion, java.source.base, java.hints, refactoring.java, form) tests labels Jun 17, 2025
Copy link
Member

@mbien mbien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please remove "solves issue 8445" from the commit message.

feel free to squash + rebase right away with the modifications since this is a smaller diff

I am going to update the PR title and link the PR to the issue. Btw we typically don't create issues for PRs if we plan to fix the problem anyway.

@mbien mbien changed the title closes 8445: test UseSuperTypeTest when ran on jdk >= 21 update UseSuperTypeTest for jdk 21 Jun 17, 2025
@mbien mbien added this to the NB27 milestone Jun 17, 2025
@mbien
Copy link
Member

mbien commented Jun 19, 2025

fyi: the email address on this commit is not the same as on your other commits

@homberghp
Copy link
Contributor Author

fyi: the email address on this commit is not the same as on your other commits

I know. The other email address was from the time when I joined GitHub. It is an email address I can no longer access.

@mbien
Copy link
Member

mbien commented Jun 20, 2025

the second commit has now the right email address I believe.

Whats left is to:

squashing works like this:
inspect history:

$ git log --oneline
c4a0768b8 (HEAD -> issue8445) repair email address
3984a77b5 solves issue 8445
256edf4e9 (origin/master, master) Merge pull request #8604 from mbien/vue-css-prerequisite
...

lets say you want to squash the last two commits on top of that list and there is no merge commit in between

git rebase --autostash -i HEAD~2

this will open an editor with the following content

pick 3984a77b5 solves issue 8445                                        
pick c4a0768b8 repair email address                                     
                                                                        
# Rebase 256edf4e9..c4a0768b8 onto 256edf4e9 (2 commands)               
#                                                                       
# Commands:
... (more instructions)

By editing the second item on the list and changing pick into s and then saving+exiting the editor, git will squash the second line into the first (bottom up) and open another editor window, this window is for the commit message.

A well formatted commit message has a short description in the first line, then a blank line, then more info if needed.
for example for this change, I believe the PR title would be sufficient:

update UseSuperTypeTest for jdk 21

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
... (more info)

thats it, now check the log again and it should look like:

$ git log --oneline
eee9647b3 (HEAD -> issue8445) update UseSuperTypeTest for jdk 21
256edf4e9 (origin/master, master) Merge pull request #8604 from mbien/vue-css-prerequisite
219724b1d Add build-prerequisite flag to css.prep dep of javascript2.vue

Now in NetBeans, lets say you want to add something to the last commit without using the shell, simply use the commit action as usual, but check "Amend Last Commit" on the commit window. This will add the changes to the last commit, and also replace the commit message.
image

force push into the PR branch and it should be good. (see #8575 (comment))

@homberghp homberghp force-pushed the issue8445 branch 4 times, most recently from b3fbffc to 67abba7 Compare June 22, 2025 14:47
Create expected code depending on java.version string
Copy link
Member

@mbien mbien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

excellent - thanks for updating the test!

will merge once green

@mbien mbien merged commit 11bcde5 into apache:master Jun 22, 2025
106 of 108 checks passed
@homberghp homberghp deleted the issue8445 branch June 22, 2025 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Java [ci] enable extra Java tests (java.completion, java.source.base, java.hints, refactoring.java, form) tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

test UseSuperTypeTest.test230345 fails on java 21 because of SequencedCollection
2 participants