You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2022/06/02 11:10:04 UTC
[GitHub] [netbeans] neilcsmith-net opened a new pull request, #4189: Snapshot of APIs as of NetBeans 14
neilcsmith-net opened a new pull request, #4189:
URL: https://github.com/apache/netbeans/pull/4189
Snapshot of APIs as of NetBeans 14. For review (sorry, bit late, should have started at branch). Not to be merged as / until release vote completes.
Built in the usual way -
```
# checkout branch (or release tag)
git checkout release140
ant clean
ant build
ant gen-sigtests-release
git add -A
git stash
git checkout master
git checkout -b apis-nb140
git stash pop
git add -A
git commit -m "Snapshot of APIs as of NetBeans 14"
# remove getPeer() calls
find . -name "*.sig" -exec sed -i '/java.awt.peer.ComponentPeer/{N;d;}' {} \;
# check git diff
git add -A
git commit --amend
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] neilcsmith-net commented on pull request #4189: Snapshot of APIs as of NetBeans 14
Posted by GitBox <gi...@apache.org>.
neilcsmith-net commented on PR #4189:
URL: https://github.com/apache/netbeans/pull/4189#issuecomment-1156279089
> I assume, that a recent update of the gradle module broadend the API and thus both branches have changes in that file. The diff looks trivial:
Well, broadened and narrowed - see #3908 - those classes are no longer in the "API". My reading of @lkishalmi comments is that they are safe removal, including from sigtests, as they're not really public. I'll merge favouring current master state. Mentioning in case anyone has concerns at their removal here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebarboni merged pull request #4189: Snapshot of APIs as of NetBeans 14
Posted by GitBox <gi...@apache.org>.
ebarboni merged PR #4189:
URL: https://github.com/apache/netbeans/pull/4189
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] neilcsmith-net commented on pull request #4189: Snapshot of APIs as of NetBeans 14
Posted by GitBox <gi...@apache.org>.
neilcsmith-net commented on PR #4189:
URL: https://github.com/apache/netbeans/pull/4189#issuecomment-1156303951
@ebarboni I "cheated" and used GitHub's UI for conflicts. Think it's fine. Feel free to merge if OK, or I can handle locally and re-do.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebarboni commented on pull request #4189: Snapshot of APIs as of NetBeans 14
Posted by GitBox <gi...@apache.org>.
ebarboni commented on PR #4189:
URL: https://github.com/apache/netbeans/pull/4189#issuecomment-1160368341
@neilcsmith-net sorry forget to press the button
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebarboni commented on pull request #4189: Snapshot of APIs as of NetBeans 14
Posted by GitBox <gi...@apache.org>.
ebarboni commented on PR #4189:
URL: https://github.com/apache/netbeans/pull/4189#issuecomment-1152497816
not able to see where the conflict is
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebarboni commented on pull request #4189: Snapshot of APIs as of NetBeans 14
Posted by GitBox <gi...@apache.org>.
ebarboni commented on PR #4189:
URL: https://github.com/apache/netbeans/pull/4189#issuecomment-1156565356
travis is showing that
class org.netbeans.modules.java.lsp.server.ui.UIContext
"E1.2 - API type removed" : method protected java.util.concurrent.CompletableFuture org.netbeans.modules.java.lsp.server.ui.UIContext.showQuickPick(org.netbeans.modules.java.lsp.server.protocol.ShowQuickPickParams)
"E1.2 - API type removed" : method protected java.util.concurrent.CompletableFuture org.netbeans.modules.java.lsp.server.ui.UIContext.showInputBox(org.netbeans.modules.java.lsp.server.protocol.ShowInputBoxParams)
I'm not sure what should be done ? we merge anyway ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] matthiasblaesing commented on pull request #4189: Snapshot of APIs as of NetBeans 14
Posted by GitBox <gi...@apache.org>.
matthiasblaesing commented on PR #4189:
URL: https://github.com/apache/netbeans/pull/4189#issuecomment-1152529405
The conflict is in `extide/gradle/nbproject/org-netbeans-modules-gradle.sig`. I assume, that a recent update of the gradle module broadend the API and thus both branches have changes in that file. The diff looks trivial:
```diff
diff --cc extide/gradle/nbproject/org-netbeans-modules-gradle.sig
index a1d7b3483313,10434b6c15b2..000000000000
--- a/extide/gradle/nbproject/org-netbeans-modules-gradle.sig
+++ b/extide/gradle/nbproject/org-netbeans-modules-gradle.sig
@@@ -280,6 -297,24 +280,27 @@@ meth public static org.netbeans.modules
meth public static org.netbeans.modules.gradle.api.NbGradleProject$Quality[] values()
supr java.lang.Enum<org.netbeans.modules.gradle.api.NbGradleProject$Quality>
++<<<<<<< HEAD
++=======
+ CLSS public abstract interface org.netbeans.modules.gradle.api.NbProjectInfo
+ innr public abstract interface static Report
+ intf org.gradle.tooling.model.Model
+ intf org.netbeans.modules.gradle.tooling.Model
+ meth public abstract boolean getMiscOnly()
+ meth public abstract java.util.Map<java.lang.String,java.lang.Object> getExt()
+ meth public abstract java.util.Map<java.lang.String,java.lang.Object> getInfo()
+ meth public abstract java.util.Set<java.lang.String> getProblems()
+ meth public abstract java.util.Set<org.netbeans.modules.gradle.api.NbProjectInfo$Report> getReports()
+
+ CLSS public abstract interface static org.netbeans.modules.gradle.api.NbProjectInfo$Report
+ outer org.netbeans.modules.gradle.api.NbProjectInfo
+ meth public abstract int getLineNumber()
+ meth public abstract java.lang.String getErrorClass()
+ meth public abstract java.lang.String getMessage()
+ meth public abstract java.lang.String getScriptLocation()
+ meth public abstract org.netbeans.modules.gradle.api.NbProjectInfo$Report getCause()
+
++>>>>>>> github/pr/4189
CLSS public abstract interface org.netbeans.modules.gradle.api.execute.ActionMapping
fld public final static java.lang.String CUSTOM_PREFIX = "custom-"
innr public final static !enum ReloadRule
```
I suggest to merge locally and accept the version from master for this file.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] ebarboni commented on pull request #4189: Snapshot of APIs as of NetBeans 14
Posted by GitBox <gi...@apache.org>.
ebarboni commented on PR #4189:
URL: https://github.com/apache/netbeans/pull/4189#issuecomment-1155160482
@neilcsmith-net could you do the "resolution of conflict"
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists