You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by lk...@apache.org on 2020/09/15 17:10:14 UTC

[netbeans] branch master updated (eba3ee2 -> ec0a7ae)

This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.


    from eba3ee2  Updating CI: libs.truffleapi moved to ide.
     add ec0a7ae  git revert -m 2 814184bRevert "Merge remote-tracking branch 'apache/master' into ModernCode"

No new revisions were added by this update.

Summary of changes:
 .../apisupport/project/NbModuleProject.java        |   2 -
 .../project/queries/CompilerOptionsQueryImpl.java  |  72 -----
 javafx/maven.htmlui/nbproject/project.properties   |   3 +-
 .../modules/maven/htmlui/DukeScriptWizard.java     |  98 +++---
 .../modules/maven/htmlui/MacUtilities.java         |   6 +-
 .../modules/maven/htmlui/MavenUtilities.java       |   9 +-
 .../antsrc/org/netbeans/nbbuild/CustomJavac.java   |  75 +----
 .../org/netbeans/nbbuild/ParseProjectXml.java      |   8 +-
 nbbuild/cluster.properties                         |   1 -
 nbbuild/external/binaries-list                     |   1 -
 nbbuild/external/compiler-14.0.2-license.txt       | 356 ---------------------
 nbbuild/jdk.xml                                    |   1 -
 nbbuild/templates/common.xml                       |   9 +-
 platform/api.htmlui/nbproject/project.properties   |   3 +-
 .../src/org/netbeans/modules/htmlui/Buttons.java   |  61 ++--
 .../org/netbeans/modules/htmlui/HtmlComponent.java |  20 +-
 .../netbeans/modules/htmlui/jfx/NbBrowsers.java    |  20 +-
 .../org/netbeans/modules/htmlui/DialogsTest.java   |   9 +-
 platform/applemenu.jdk9/build.xml                  |  25 --
 platform/applemenu.jdk9/manifest.mf                |   7 -
 .../applemenu.jdk9/nbproject/project.properties    |  22 --
 platform/applemenu.jdk9/nbproject/project.xml      |  46 ---
 .../modules/applemenu/jdk9/Bundle.properties       |  30 --
 platform/applemenu/build.xml                       |  11 +
 ...lemenu-external-desktop-classes-8.2-license.txt |   0
 platform/applemenu/external/binaries-list          |   1 +
 platform/applemenu/nbproject/project.properties    |   3 +-
 platform/applemenu/nbproject/project.xml           |   5 +-
 .../org/netbeans/modules/applemenu/Install.java    |  37 ++-
 .../applemenu/{spi => }/NbApplicationAdapter.java  |  26 +-
 .../applemenu/NbApplicationAdapterJDK8.java        |  32 +-
 .../applemenu}/NbApplicationAdapterJDK9.java       |  36 ++-
 32 files changed, 217 insertions(+), 818 deletions(-)
 delete mode 100644 apisupport/apisupport.ant/src/org/netbeans/modules/apisupport/project/queries/CompilerOptionsQueryImpl.java
 delete mode 100644 nbbuild/external/compiler-14.0.2-license.txt
 delete mode 100644 platform/applemenu.jdk9/build.xml
 delete mode 100644 platform/applemenu.jdk9/manifest.mf
 delete mode 100644 platform/applemenu.jdk9/nbproject/project.properties
 delete mode 100644 platform/applemenu.jdk9/nbproject/project.xml
 delete mode 100644 platform/applemenu.jdk9/src/org/netbeans/modules/applemenu/jdk9/Bundle.properties
 copy {nbi/engine => platform/applemenu}/external/applemenu-external-desktop-classes-8.2-license.txt (100%)
 rename platform/applemenu/src/org/netbeans/modules/applemenu/{spi => }/NbApplicationAdapter.java (89%)
 rename platform/{applemenu.jdk9/src/org/netbeans/modules/applemenu/jdk9 => applemenu/src/org/netbeans/modules/applemenu}/NbApplicationAdapterJDK9.java (72%)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists