This is an automated email from the ASF dual-hosted git repository. geertjan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 9b57f071c3af779ffad4590fbb226874aa29c992 Merge: da0370b 0c2d889 Author: Geertjan Wielenga <[email protected]> AuthorDate: Tue Aug 28 12:14:56 2018 +0100 Merge pull request #790 from dukescript/CrossCompile Enable JDK matrix in Travis .gitignore | 1 + .travis.yml | 19 +- nbbuild/templates/common.xml | 2 +- nbi/engine/build.xml | 9 +- platform/applemenu/build.xml | 3 +- .../src/org/netbeans/core/execution/SecMan.java | 14 +- .../core/netigso/NetigsoOSGiIsNotFriendTest.java | 8 +- .../core/startup/ModuleListStartLevelTest.java | 7 +- platform/libs.javafx/build.xml | 25 +- platform/libs.javafx/external/binaries-list | 2 +- ...cense.txt => lib-javafx-13.03-beta-license.txt} | 8 +- .../netbinox/NetigsoOSGiIsNotFriendTest.java | 6 +- platform/o.n.bootstrap/build.xml | 2 +- platform/o.n.bootstrap/src/java/lang/Module.java | 23 ++ .../src/org/netbeans/NbInstrumentation.java | 12 +- .../src/org/netbeans/TopSecurityManager.java | 16 +- platform/openide.util.enumerations/build.xml | 15 +- .../nbproject/project.properties | 1 + .../modules/openide/util/NbBundleProcessor.java | 382 --------------------- .../modules/openide/util/NbBundleProcessor.java | 1 - 20 files changed, 123 insertions(+), 433 deletions(-) --------------------------------------------------------------------- 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
