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

sdedic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git

commit 56231e681d1737b1ab85544b3f5864d49befc010
Merge: 04893fe 2766cac
Author: Svatopluk Dedic <svatopluk.de...@oracle.com>
AuthorDate: Thu Nov 22 12:43:03 2018 +0100

    Merge pull request #917 from dukescript/JavaFX11
    
    Fragments for libs.javafx with JavaFX 11 implementation

 ergonomics/ide.ergonomics/java.properties          |   1 +
 .../ide/ergonomics/fod/ConfigurationPanel.java     |  19 +-
 .../modules/ide/ergonomics/fod/FeatureInfo.java    |  37 +-
 .../ide/ergonomics/fod/FindComponentModules.java   |  24 +-
 ...achingPreventsLoadingOfModuleManifestsTest.java |   2 +-
 .../libs.javafx.linux}/build.xml                   |  10 +-
 .../libs.javafx.linux/external/binaries-list       |  14 +-
 .../external/javafx-base-11-linux.jar.external     |   2 +
 .../external/javafx-controls-11-linux.jar.external |   2 +
 .../external/javafx-graphics-11-linux.jar.external |   2 +
 .../external/javafx-linux-11-license.txt           | 435 +++++++++++++++++++++
 .../external/javafx-media-11-linux.jar.external    |   2 +
 .../external/javafx-swing-11-linux.jar.external    |   2 +
 .../external/javafx-web-11-linux.jar.external      |   2 +
 extra/libs.javafx.linux/manifest.mf                |   8 +
 .../libs.javafx.linux/nbproject/project.properties |  36 ++
 extra/libs.javafx.linux/nbproject/project.xml      |  72 ++++
 .../netbeans/libs/javafx/linux/Bundle.properties   |  12 +-
 .../libs.javafx.macosx}/build.xml                  |  10 +-
 .../libs.javafx.macosx/external/binaries-list      |  14 +-
 .../external/javafx-base-11-mac.jar.external       |   2 +
 .../external/javafx-controls-11-mac.jar.external   |   2 +
 .../external/javafx-graphics-11-mac.jar.external   |   2 +
 .../external/javafx-mac-11-license.txt             | 435 +++++++++++++++++++++
 .../external/javafx-media-11-mac.jar.external      |   2 +
 .../external/javafx-swing-11-mac.jar.external      |   2 +
 .../external/javafx-web-11-mac.jar.external        |   2 +
 extra/libs.javafx.macosx/manifest.mf               |   8 +
 .../nbproject/project.properties                   |  36 ++
 extra/libs.javafx.macosx/nbproject/project.xml     |  72 ++++
 .../netbeans/libs/javafx/macosx/Bundle.properties  |  12 +-
 .../libs.javafx.win}/build.xml                     |  10 +-
 .../libs.javafx.win/external/binaries-list         |  14 +-
 .../external/javafx-base-11-win.jar.external       |   2 +
 .../external/javafx-controls-11-win.jar.external   |   2 +
 .../external/javafx-graphics-11-win.jar.external   |   2 +
 .../external/javafx-media-11-win.jar.external      |   2 +
 .../external/javafx-swing-11-win.jar.external      |   2 +
 .../external/javafx-web-11-win.jar.external        |   2 +
 .../external/javafx-win-11-license.txt             | 435 +++++++++++++++++++++
 extra/libs.javafx.win/manifest.mf                  |   8 +
 extra/libs.javafx.win/nbproject/project.properties |  36 ++
 extra/libs.javafx.win/nbproject/project.xml        |  72 ++++
 .../org/netbeans/libs/javafx/win/Bundle.properties |  12 +-
 .../maven/embedder/impl/MavenProtocolHandler.java  |   2 +-
 nb/updatecenters/build.xml                         |  23 ++
 .../updatecenters/resources/Bundle.properties      |   4 +
 .../modules/updatecenters/resources/mf-layer.xml   |  10 +
 nbbuild/cluster.properties                         |  11 +
 nbbuild/rat-exclusions.txt                         |   1 +
 .../netbeans/core/startup/MavenRepoURLHandler.java |  75 ++++
 51 files changed, 1903 insertions(+), 103 deletions(-)


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

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

Reply via email to