Merging with most recent changes in master

.gitignore

@@ -22,6 +22,14 @@
 /nbi/engine/native/*/*/dist/
 /nb-javac/
 /java.source.nbjavac/test/test-nb-javac/nbproject/private/
+/apisupport.harness/windows-launcher-src/*.exe
+/apisupport.harness/windows-launcher-src/*.res
+/ide/launcher/windows/*.exe
+/ide/launcher/windows/*.res
+/o.n.bootstrap/launcher/windows/*.dll
+/o.n.bootstrap/launcher/windows/*.exe
+/o.n.bootstrap/launcher/windows/*.res
+
 
 # OS generated files #
 ######################

.travis.yml

@@ -18,8 +18,9 @@ language: java
 jdk:
   - oraclejdk8
 script:
-  - ant -quiet rat -Drat-report.haltonfailure=true
+  - (ant -quiet build-source-config && mkdir scratch && cd scratch && unzip -qq ../nbbuild/build/basic-src* && ant -quiet rat -Drat-report.haltonfailure=true && cd .. && rm -rf scratch)
   - ant -quiet build -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false
   - ant -quiet test -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false -Dtest.includes=NoTestsJustBuild
   - ant -quiet verify-libs-and-licenses -Dverify-libs-and-licenses.haltonfailure=true
+  - ant -quiet -f ide.ergonomics/ test -Dtest.config=commit
   - ./travis-check-line-endings.sh

README.md

@@ -94,7 +94,8 @@ change of the file headers to Apache. But then the magic comes:
 ```bash
 $ git remote add emilian https://github.com/emilianbold/netbeans-releases.git
 $ git fetch emilian # this takes a while, the history is huge!
-$ git replace 6daa72c98 32042637
+$ git replace 6daa72c98 32042637 # the 1st donation
+$ git replace 6035076ee 32042637 # the 2nd donation
 ```
 
 When you search the log, or use the blame tool, the full history is available:

ant.browsetask/manifest.mf

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.ant.browsetask
-OpenIDE-Module-Specification-Version: 1.41
+OpenIDE-Module-Specification-Version: 1.43
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ant/browsetask/Bundle.properties
 AutoUpdate-Show-In-Client: false
 

ant.debugger/nbproject/project.properties

@@ -17,7 +17,7 @@
 
 javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.6
-spec.version.base=1.38.0
+spec.version.base=1.40.0
 test.unit.run.cp.extra=${tools.jar}
 # Make the debugger find it, even if it is not on the startup debug classpath:
 # (note: first entry is for accuracy in case you customize it; second for convenience)

ant.freeform/manifest.mf

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.ant.freeform/1
-OpenIDE-Module-Specification-Version: 1.47
+OpenIDE-Module-Specification-Version: 1.49
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ant/freeform/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/ant/freeform/resources/layer.xml
 AutoUpdate-Show-In-Client: false

ant.grammar/manifest.mf

@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.ant.grammar/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ant/grammar/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.45
+OpenIDE-Module-Specification-Version: 1.47
 

ant.kit/manifest.mf

@@ -3,5 +3,5 @@ OpenIDE-Module: org.netbeans.modules.ant.kit
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ant/kit/Bundle.properties
 OpenIDE-Module-Requires: BuildActions
 OpenIDE-Module-Recommends: org.netbeans.modules.testng.ant.AntTestNGSupport,org.netbeans.modules.junit.ant.JUnitAntLogger,org.netbeans.modules.junit.ant.ui.AntJUnitManagerProvider
-OpenIDE-Module-Specification-Version: 1.30
+OpenIDE-Module-Specification-Version: 1.32
 

api.debugger.jpda/manifest.mf

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.api.debugger.jpda/2
 OpenIDE-Module-Localizing-Bundle: org/netbeans/api/debugger/jpda/Bundle.properties
-OpenIDE-Module-Specification-Version: 3.7
+OpenIDE-Module-Specification-Version: 3.9
 OpenIDE-Module-Package-Dependencies: com.sun.jdi[VirtualMachineManager]
 

api.debugger.jpda/nbproject/org-netbeans-api-debugger-jpda.sig

@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 3.3.1
+#Version 3.8.1
 
 CLSS public abstract interface java.io.Serializable
 
@@ -279,11 +279,14 @@ hcls FieldBreakpointImpl
 CLSS public org.netbeans.api.debugger.jpda.InvalidExpressionException
 cons public init(java.lang.String)
 cons public init(java.lang.String,java.lang.Throwable)
+cons public init(java.lang.String,java.lang.Throwable,boolean)
 cons public init(java.lang.Throwable)
+cons public init(java.lang.Throwable,boolean)
+meth public final boolean hasApplicationTarget()
 meth public java.lang.String getMessage()
 meth public java.lang.Throwable getTargetException()
 supr java.lang.Exception
-hfds message
+hfds isFromApp,message
 
 CLSS public abstract interface org.netbeans.api.debugger.jpda.JPDAArrayType
 intf org.netbeans.api.debugger.jpda.JPDAClassType
@@ -854,8 +857,10 @@ hfds v,var
 CLSS public abstract org.netbeans.spi.debugger.jpda.SmartSteppingCallback
 cons public init()
 innr public abstract interface static !annotation Registration
+innr public final static StopOrStep
 meth public abstract boolean stopHere(org.netbeans.spi.debugger.ContextProvider,org.netbeans.api.debugger.jpda.JPDAThread,org.netbeans.api.debugger.jpda.SmartSteppingFilter)
 meth public abstract void initFilter(org.netbeans.api.debugger.jpda.SmartSteppingFilter)
+meth public org.netbeans.spi.debugger.jpda.SmartSteppingCallback$StopOrStep stopAt(org.netbeans.spi.debugger.ContextProvider,org.netbeans.api.debugger.jpda.CallStackFrame,org.netbeans.api.debugger.jpda.SmartSteppingFilter)
 supr java.lang.Object
 hcls ContextAware
 
@@ -866,6 +871,20 @@ CLSS public abstract interface static !annotation org.netbeans.spi.debugger.jpda
 intf java.lang.annotation.Annotation
 meth public abstract !hasdefault java.lang.String path()
 
+CLSS public final static org.netbeans.spi.debugger.jpda.SmartSteppingCallback$StopOrStep
+ outer org.netbeans.spi.debugger.jpda.SmartSteppingCallback
+meth public boolean equals(java.lang.Object)
+meth public boolean isStop()
+meth public int getStepDepth()
+meth public int getStepSize()
+meth public int hashCode()
+meth public java.lang.String toString()
+meth public static org.netbeans.spi.debugger.jpda.SmartSteppingCallback$StopOrStep skip()
+meth public static org.netbeans.spi.debugger.jpda.SmartSteppingCallback$StopOrStep step(int,int)
+meth public static org.netbeans.spi.debugger.jpda.SmartSteppingCallback$StopOrStep stop()
+supr java.lang.Object
+hfds SKIP,STOP,stepDepth,stepSize,stop
+
 CLSS public abstract org.netbeans.spi.debugger.jpda.SourcePathProvider
 cons public init()
 fld public final static java.lang.String PROP_SOURCE_ROOTS = "sourceRoots"

api.debugger/manifest.mf

@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.api.debugger/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/api/debugger/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.55
+OpenIDE-Module-Specification-Version: 1.57
 OpenIDE-Module-Layer: org/netbeans/api/debugger/layer.xml

api.debugger/nbproject/org-netbeans-api-debugger.sig

@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 1.52.1
+#Version 1.56.1
 
 CLSS public abstract interface java.beans.PropertyChangeListener
 intf java.util.EventListener
@@ -238,6 +238,7 @@ meth public org.netbeans.api.debugger.DebuggerEngine[] getDebuggerEngines()
 meth public org.netbeans.api.debugger.DebuggerEngine[] startDebugging(org.netbeans.api.debugger.DebuggerInfo)
 meth public org.netbeans.api.debugger.Session getCurrentSession()
 meth public org.netbeans.api.debugger.Session[] getSessions()
+meth public org.netbeans.api.debugger.Watch createPinnedWatch(java.lang.String,org.netbeans.api.debugger.Watch$Pin)
 meth public org.netbeans.api.debugger.Watch createWatch(int,java.lang.String)
 meth public org.netbeans.api.debugger.Watch createWatch(java.lang.String)
 meth public org.netbeans.api.debugger.Watch[] getWatches()
@@ -394,15 +395,20 @@ CLSS public final org.netbeans.api.debugger.Watch
 fld public final static java.lang.String PROP_ENABLED = "enabled"
 fld public final static java.lang.String PROP_EXPRESSION = "expression"
 fld public final static java.lang.String PROP_VALUE = "value"
+innr public abstract interface static Pin
 meth public boolean isEnabled()
 meth public java.lang.String getExpression()
+meth public org.netbeans.api.debugger.Watch$Pin getPin()
 meth public void addPropertyChangeListener(java.beans.PropertyChangeListener)
 meth public void remove()
 meth public void removePropertyChangeListener(java.beans.PropertyChangeListener)
 meth public void setEnabled(boolean)
 meth public void setExpression(java.lang.String)
 supr java.lang.Object
-hfds enabled,expression,pcs
+hfds enabled,expression,pcs,pin
+
+CLSS public abstract interface static org.netbeans.api.debugger.Watch$Pin
+ outer org.netbeans.api.debugger.Watch
 
 CLSS public abstract org.netbeans.spi.debugger.ActionsProvider
 cons public init()

api.java.classpath/manifest.mf

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.api.java.classpath/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/api/java/classpath/Bundle.properties
 OpenIDE-Module-Recommends: cnb.org.netbeans.api.java.classpath.nb
-OpenIDE-Module-Specification-Version: 1.54
+OpenIDE-Module-Specification-Version: 1.56
 

api.java.classpath/nbproject/org-netbeans-api-java-classpath.sig

@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 1.50.1
+#Version 1.55.1
 
 CLSS public abstract interface java.io.Serializable
 
@@ -63,6 +63,7 @@ fld public final static org.netbeans.api.java.classpath.ClassPath EMPTY
 innr public final Entry
 innr public final static !enum Flag
 innr public final static !enum PathConversionMode
+innr public final static !enum PathEmbeddingMode
 meth public boolean equals(java.lang.Object)
 meth public final boolean contains(org.openide.filesystems.FileObject)
 meth public final boolean isResourceVisible(org.openide.filesystems.FileObject)
@@ -77,7 +78,14 @@ meth public final void addPropertyChangeListener(java.beans.PropertyChangeListen
 meth public final void removePropertyChangeListener(java.beans.PropertyChangeListener)
 meth public int hashCode()
 meth public java.lang.String toString()
+ anno 0 org.netbeans.api.annotations.common.NonNull()
 meth public java.lang.String toString(org.netbeans.api.java.classpath.ClassPath$PathConversionMode)
+ anno 0 org.netbeans.api.annotations.common.NonNull()
+ anno 1 org.netbeans.api.annotations.common.NonNull()
+meth public java.lang.String toString(org.netbeans.api.java.classpath.ClassPath$PathConversionMode,org.netbeans.api.java.classpath.ClassPath$PathEmbeddingMode)
+ anno 0 org.netbeans.api.annotations.common.NonNull()
+ anno 1 org.netbeans.api.annotations.common.NonNull()
+ anno 2 org.netbeans.api.annotations.common.NonNull()
 meth public java.util.List<org.netbeans.api.java.classpath.ClassPath$Entry> entries()
 meth public java.util.Set<org.netbeans.api.java.classpath.ClassPath$Flag> getFlags()
  anno 0 org.netbeans.api.annotations.common.NonNull()
@@ -87,7 +95,7 @@ meth public static org.netbeans.api.java.classpath.ClassPath getClassPath(org.op
  anno 1 org.netbeans.api.annotations.common.NonNull()
  anno 2 org.netbeans.api.annotations.common.NonNull()
 supr java.lang.Object
-hfds EMPTY_REF,LOG,caller,entriesCache,impl,implementations,invalidEntries,invalidRoots,pListener,propSupport,refClassLoader,root2Filter,rootsCache,rootsListener,weakPListeners
+hfds EMPTY_REF,LOG,URL_EMBEDDING,caller,entriesCache,impl,implementations,invalidEntries,invalidRoots,pListener,propSupport,refClassLoader,root2Filter,rootsCache,rootsListener,weakPListeners
 hcls RootsListener,SPIListener
 
 CLSS public final org.netbeans.api.java.classpath.ClassPath$Entry
@@ -123,6 +131,15 @@ meth public static org.netbeans.api.java.classpath.ClassPath$PathConversionMode
 meth public static org.netbeans.api.java.classpath.ClassPath$PathConversionMode[] values()
 supr java.lang.Enum<org.netbeans.api.java.classpath.ClassPath$PathConversionMode>
 
+CLSS public final static !enum org.netbeans.api.java.classpath.ClassPath$PathEmbeddingMode
+ outer org.netbeans.api.java.classpath.ClassPath
+fld public final static org.netbeans.api.java.classpath.ClassPath$PathEmbeddingMode EXCLUDE
+fld public final static org.netbeans.api.java.classpath.ClassPath$PathEmbeddingMode FAIL
+fld public final static org.netbeans.api.java.classpath.ClassPath$PathEmbeddingMode INCLUDE
+meth public static org.netbeans.api.java.classpath.ClassPath$PathEmbeddingMode valueOf(java.lang.String)
+meth public static org.netbeans.api.java.classpath.ClassPath$PathEmbeddingMode[] values()
+supr java.lang.Enum<org.netbeans.api.java.classpath.ClassPath$PathEmbeddingMode>
+
 CLSS public final org.netbeans.api.java.classpath.GlobalPathRegistry
 meth public java.util.Set<org.netbeans.api.java.classpath.ClassPath> getPaths(java.lang.String)
  anno 0 org.netbeans.api.annotations.common.NonNull()
@@ -174,7 +191,7 @@ innr public static Result2
 meth public static org.netbeans.api.java.queries.SourceForBinaryQuery$Result findSourceRoots(java.net.URL)
 meth public static org.netbeans.api.java.queries.SourceForBinaryQuery$Result2 findSourceRoots2(java.net.URL)
 supr java.lang.Object
-hfds EMPTY_RESULT,EMPTY_RESULT2,LOG,implementations
+hfds EMPTY_RESULT,LOG,implementations
 hcls EmptyResult
 
 CLSS public abstract interface static org.netbeans.api.java.queries.SourceForBinaryQuery$Result
@@ -244,16 +261,30 @@ meth public abstract void addPropertyChangeListener(java.beans.PropertyChangeLis
 meth public abstract void removePropertyChangeListener(java.beans.PropertyChangeListener)
 
 CLSS public org.netbeans.spi.java.classpath.support.ClassPathSupport
+innr public abstract interface static Selector
 meth public !varargs static org.netbeans.api.java.classpath.ClassPath createClassPath(java.net.URL[])
 meth public !varargs static org.netbeans.api.java.classpath.ClassPath createClassPath(org.openide.filesystems.FileObject[])
 meth public !varargs static org.netbeans.api.java.classpath.ClassPath createProxyClassPath(org.netbeans.api.java.classpath.ClassPath[])
 meth public !varargs static org.netbeans.spi.java.classpath.ClassPathImplementation createProxyClassPathImplementation(org.netbeans.spi.java.classpath.ClassPathImplementation[])
 meth public static org.netbeans.api.java.classpath.ClassPath createClassPath(java.lang.String)
 meth public static org.netbeans.api.java.classpath.ClassPath createClassPath(java.util.List<? extends org.netbeans.spi.java.classpath.PathResourceImplementation>)
+meth public static org.netbeans.api.java.classpath.ClassPath createMultiplexClassPath(org.netbeans.spi.java.classpath.support.ClassPathSupport$Selector)
+ anno 0 org.netbeans.api.annotations.common.NonNull()
+ anno 1 org.netbeans.api.annotations.common.NonNull()
 meth public static org.netbeans.spi.java.classpath.ClassPathImplementation createClassPathImplementation(java.util.List<? extends org.netbeans.spi.java.classpath.PathResourceImplementation>)
 meth public static org.netbeans.spi.java.classpath.PathResourceImplementation createResource(java.net.URL)
 supr java.lang.Object
 
+CLSS public abstract interface static org.netbeans.spi.java.classpath.support.ClassPathSupport$Selector
+ outer org.netbeans.spi.java.classpath.support.ClassPathSupport
+fld public final static java.lang.String PROP_ACTIVE_CLASS_PATH = "activeClassPath"
+meth public abstract org.netbeans.api.java.classpath.ClassPath getActiveClassPath()
+ anno 0 org.netbeans.api.annotations.common.NonNull()
+meth public abstract void addPropertyChangeListener(java.beans.PropertyChangeListener)
+ anno 1 org.netbeans.api.annotations.common.NonNull()
+meth public abstract void removePropertyChangeListener(java.beans.PropertyChangeListener)
+ anno 1 org.netbeans.api.annotations.common.NonNull()
+
 CLSS public abstract org.netbeans.spi.java.classpath.support.CompositePathResourceBase
 cons public init()
 intf org.netbeans.spi.java.classpath.PathResourceImplementation

api.java/manifest.mf

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.api.java/1
-OpenIDE-Module-Specification-Version: 1.66
+OpenIDE-Module-Specification-Version: 1.68
 OpenIDE-Module-Localizing-Bundle: org/netbeans/api/java/queries/Bundle.properties
 AutoUpdate-Show-In-Client: false