Skip to content
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

Snapshot of APIs as of 12.6 #3347

Merged
merged 1 commit into from Dec 3, 2021
Merged

Conversation

neilcsmith-net
Copy link
Member

Snapshot of APIs as of 12.6. We should have produced this earlier - had slipped my mind, anyway.

Had to build and produce these on JDK 8. Doing with JDK 11 is failing with an error. Same for other people? We'll need to fix that by NB13 - haven't looked at what is failing - some reference to JDK classes IIRC.

Also had to resolve following conflicts in merging - ignored the removed modules, left javacapi as in master.

deleted by us:   ide/libs.bytelist/nbproject/org-netbeans-libs-bytelist.sig
deleted by us:   ide/libs.jvyamlb/nbproject/org-netbeans-libs-jvyamlb.sig
both modified:   java/libs.javacapi/nbproject/org-netbeans-libs-javacapi.sig

Built in the usual way

# checkout branch (or release tag)
git checkout release126
ant clean
ant build
ant gen-sigtests-release
git add -A
git stash
git checkout master
git checkout -b apis-nb126
git stash pop
git add -A
git commit -m "Snapshot of APIs as of 12.6"
# remove getPeer() calls
find . -name "*.sig" -exec sed -i '/java.awt.peer.ComponentPeer/{N;d;}' {} \;
# check git diff
git add -A
git commit --amend

@neilcsmith-net neilcsmith-net requested review from JaroslavTulach, ebarboni and geertjanw and removed request for JaroslavTulach November 30, 2021 16:43
Copy link

@JaroslavTulach JaroslavTulach left a comment

Choose a reason for hiding this comment

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

Looks sane at first glance.

@neilcsmith-net
Copy link
Member Author

Thanks @JaroslavTulach Merging. Let's get it in before we get any more conflicts. Any thoughts on the JDK 11 problem?

@neilcsmith-net neilcsmith-net merged commit f6634f9 into apache:master Dec 3, 2021
@neilcsmith-net neilcsmith-net deleted the apis-nb126 branch January 16, 2024 09:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants