[netbeans] branch master updated (7f8a772d75 -> 1a30943)

[jt...@apache.org]

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

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


    from 7f8a772d75 Merge pull request #1610 from borisheithecker/fixBuildPlatformClusterDetection
     new 4702be4  Allow one to select "default Maven JDK" different the IDE's JDK
     new a01d861  Manage Java platforms inside of Maven settings
     new afebae0  Fixing Javadoc typo
     new 1a30943  Merge pull request #1566 from jtulach/jtulach/DefaultMavenJdk

The 3061 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../api/java/platform/PlatformsCustomizer.java     |   2 +-
 .../netbeans/modules/maven/NbMavenProjectImpl.java |   9 ++
 .../netbeans/modules/maven/api/NbMavenProject.java |  10 +-
 .../maven/classpath/AbstractBootPathImpl.java      |   5 +-
 .../modules/maven/classpath/BootClassPathImpl.java |   4 +-
 .../modules/maven/options/Bundle.properties        |   2 +
 .../modules/maven/options/MavenSettings.java       |  29 +++++
 .../modules/maven/options/SettingsPanel.form       |  87 +++++++++++----
 .../modules/maven/options/SettingsPanel.java       | 119 +++++++++++++++++----
 9 files changed, 221 insertions(+), 46 deletions(-)


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