You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jt...@apache.org on 2018/04/25 13:25:17 UTC

[incubator-netbeans] 01/01: Merge pull request #505 from jlahoda/NETBEANS-615

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

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

commit 284e056b9e74f05046e9eb0daad6f2fd84eef569
Merge: 2c1ad06 95c9c27
Author: Jaroslav Tulach <ja...@oracle.com>
AuthorDate: Wed Apr 25 15:25:10 2018 +0200

    Merge pull request #505 from jlahoda/NETBEANS-615
    
    [NETBEANS-615] When nb-javac is not installed, don't let CoS run, but…

 java.api.common/nbproject/project.xml                  |  2 +-
 .../java/api/common/project/BaseActionProvider.java    |  3 +++
 java.j2seproject/nbproject/project.xml                 |  2 +-
 .../modules/java/j2seproject/J2SEProjectUtil.java      |  3 ++-
 .../modules/java/source/ant/ProjectRunnerImpl.java     |  4 +++-
 java.source.base/apichanges.xml                        | 13 +++++++++++++
 java.source.base/manifest.mf                           |  2 +-
 java.source.base/nbproject/project.properties          |  2 +-
 .../netbeans/api/java/source/BuildArtifactMapper.java  | 11 ++++++++++-
 .../java/source/indexing/JavaCustomIndexer.java        | 18 ++++++++++++++++++
 .../java/source/usages/BuildArtifactMapperImpl.java    |  5 +++++
 .../netbeans/modules/java/source/JBrowseModule.java    |  5 +++--
 maven/nbproject/project.xml                            |  2 +-
 .../netbeans/modules/maven/api/execute/RunUtils.java   |  3 ++-
 .../modules/maven/customizer/CompilePanel.java         | 10 +++++++++-
 .../nashorn/execution/actions/ExecJSAction.java        |  6 ++++--
 16 files changed, 77 insertions(+), 14 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
jtulach@apache.org.

---------------------------------------------------------------------
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