matthiasblaesing opened a new pull request, #5301: URL: https://github.com/apache/netbeans/pull/5301
This PR was created on the basis of https://github.com/apache/netbeans/pull/4692 The changes from that PR were rebased onto master and then squashed as far as it seemed reasonable. To check the valid rebase without changing the code, this was done: ```bash git checkout -b pr-4692-ref master git merge github/pr/4692 git checkout -b pr-4692 github/pr/4692 git rebase master # + multiple squash rounds git diff pr-4692-ref..pr-4692 ``` results in ```diff diff --git a/enterprise/websvc.restapi/nbproject/org-netbeans-modules-websvc-restapi.sig b/enterprise/websvc.restapi/nbproject/org-netbeans-modules-websvc-restapi.sig index 9f7f657d6276..60e477dcc2d0 100644 --- a/enterprise/websvc.restapi/nbproject/org-netbeans-modules-websvc-restapi.sig +++ b/enterprise/websvc.restapi/nbproject/org-netbeans-modules-websvc-restapi.sig @@ -1,5 +1,5 @@ #Signature file v4.1 -#Version 1.54 +#Version 1.55 CLSS public abstract interface java.io.Serializable diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index 1f39e97a714e..5673dc068035 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -123,4 +123,4 @@ platform/o.apache.commons.lang3/external/commons-lang3-3.8.1.jar java/maven.embe ide/db.metadata.model/external/mysql-connector-j-8.0.31.jar ide/db.mysql/external/mysql-connector-j-8.0.31.jar # Jakarta EE API doc is repackaged to align with old NetBeans format, embedded indexes are thus identically and can be ignored. -enterprise/jakartaee10.platform/external/generated-jakarta.jakartaee-api-10.0.0-javadoc.jar enterprise/jakartaee10.platform/external/jakarta.jakartaee-api-10.0.0-javadoc.jar \ No newline at end of file +enterprise/jakartaee10.platform/external/generated-jakarta.jakartaee-api-10.0.0-javadoc.jar enterprise/jakartaee10.platform/external/jakarta.jakartaee-api-10.0.0-javadoc.jar ``` -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
