Merge pull request #5907 from apache/delivery

Sync delivery to release180 for 18-rc3

.github/workflows/main.yml

@@ -33,7 +33,6 @@ env:
 
   # note to self: don't remove the minus again
   OPTS: >-
-    -Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
     -Dtest-unit-sys-prop.ignore.random.failures=true
 
   # what to build and test, see nbbuild/cluster.properties

.gitignore

@@ -1,9 +1,7 @@
 /*/build/
-/*/nbproject/private/
-/*/*/nbproject/private/
+**/nbproject/private/
 /*/*/build/
 /*/*/dist/
-/*/*/*/nbproject/private/
 /*/*/*/build/
 /*/*/*/dist/
 /*/external/*.zip
@@ -35,7 +33,6 @@
 /nbbuild/netbeansrelease.json
 /nbi/engine/native/*/*/dist/
 /nb-javac/
-/java.source.nbjavac/test/test-nb-javac/nbproject/private/
 /java/java.lsp.server/vscode/.vscode-test/
 /harness/apisupport.harness/windows-launcher-src/*.exe
 /harness/apisupport.harness/windows-launcher-src/*.res
@@ -49,13 +46,10 @@
 # Various files that may be generated if the launcher projects are opened in NetBeans 8.2.
 /harness/apisupport.harness/windows-launcher-src/nbproject/Makefile-*.mk
 /harness/apisupport.harness/windows-launcher-src/nbproject/Package-*.bash
-/harness/apisupport.harness/windows-launcher-src/nbproject/private/
 /nb/ide.launcher/windows/nbproject/Makefile-*.mk
 /nb/ide.launcher/windows/nbproject/Package-*.bash
-/nb/ide.launcher/windows/nbproject/private/
 /platform/o.n.bootstrap/launcher/windows/nbproject/Makefile-*.mk
 /platform/o.n.bootstrap/launcher/windows/nbproject/Package-*.bash
-/platform/o.n.bootstrap/launcher/windows/nbproject/private/
 
 # Database logs
 derby.log
@@ -78,16 +72,10 @@ derby.log
 /websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/jaxb/
 /websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/oauth/
 /websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl/
-/javafx2.samples/FXML-LoginDemo/nbproject/private/
 
 # OS generated files - test related #
 #####################################
-/debugger.jpda.ui/test/qa-functional/data/debugTestProject/nbproject/private/
-/debugger.jpda.ui/test/qa-functional/data/debugTestProjectAnt/nbproject/private/
 /platform/o.n.bootstrap/test/unit/data/jars
-/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/private/
-/xml/test/qa-functional/data/ActionsTestProject/nbproject/private/
-/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/private/
 
 # Snapcraft Generated files #
 #######################

README.md

@@ -71,7 +71,9 @@ $ ant -q clean
 
 #### Notes:
 * You can also use `php`, `enterprise`, etc. See the [cluster.properties](https://github.com/apache/netbeans/blob/master/nbbuild/cluster.properties) file.
-* once built, you can simply open individual modules of interest with NetBeans and run/rebuild/debug them like any other project
+* Once built, you can simply open individual modules of interest with NetBeans and run/rebuild/debug them like any other project
+* Building the gradle modules on recent JDKs might fail with "Unsupported class file major version" errors. In that case the gradle daemon must be
+  configured to run on a compatible JDK (for example add `org.gradle.java.home=/home/duke/jdk17` to your `~/.gradle/gradle.properties`, see [gradle doc](https://docs.gradle.org/current/userguide/build_environment.html)).
 
 #### Generating Javadoc
 

extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java

@@ -1083,13 +1083,36 @@ private void detectSources(NbProjectInfoModel model) {
                         String langId = lang.toLowerCase();
                         Task compileTask = project.getTasks().findByName(sourceSet.getCompileTaskName(langId));
                         if (compileTask != null) {
-                            model.getInfo().put(
+                            Object o = null;
+
+                            // try to get from Kotlin options; breaking change in kotlinCompile 1.7+ does not derive from
+                            // SourceTask and does not have source/targetCompatibility. It reportedly ignores those options
+                            // even before 1.7
+                            if ("KOTLIN".equals(lang)) {
+                                o = getProperty(compileTask, "kotlinOptions", "languageVersion");
+                            } 
+                            if (o == null && compileTask.hasProperty("sourceCompatibility")) {
+                                o = getProperty(compileTask, "sourceCompatibility");
+                            }
+                            if (o != null) {
+                                model.getInfo().put(
                                     propBase + lang + "_source_compatibility",
-                                    compileTask.property("sourceCompatibility"));
-                            model.getInfo().put(
-                                    propBase + lang + "_target_compatibility",
-                                    compileTask.property("targetCompatibility"));
-
+                                    o.toString()
+                                );
+                            }
+                            o = null;
+                            if ("KOTLIN".equals(lang)) {
+                                o = getProperty(compileTask, "kotlinOptions", "jvmTarget");
+                            } 
+                            if (o == null && compileTask.hasProperty("targetCompatibility")) {
+                                o = getProperty(compileTask, "targetCompatibility");
+                            }
+                            if (o != null) {
+                                model.getInfo().put(
+                                        propBase + lang + "_target_compatibility",
+                                        o.toString()
+                                );
+                            }
                             List<String> compilerArgs;
 
                             compilerArgs = (List<String>) getProperty(compileTask, "options", "allCompilerArgs");

harness/nbjunit/src/org/netbeans/junit/NbTestCase.java

@@ -61,6 +61,7 @@
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 import junit.framework.TestResult;
+import org.junit.AssumptionViolatedException;
 import org.junit.Ignore;
 import org.netbeans.insane.live.LiveReferences;
 import org.netbeans.insane.live.Path;
@@ -74,6 +75,7 @@
  * Adds various abilities such as comparing golden files, getting a working
  * directory for test files, testing memory usage, etc.
  */
+
 public abstract class NbTestCase extends TestCase implements NbTest {
     static {
         MethodOrder.initialize();
@@ -465,7 +467,12 @@ public synchronized void waitFinished(final int timeout) throws Throwable {
             // need to have timeout because previous test case can block AWT thread
             setUp.waitFinished(computeTimeOut());
         } else {
-            setUp();
+            try {
+                setUp();
+            } catch (AssumptionViolatedException ex) {
+                // ignore, the test is assumed to be meaningless.
+                return;
+            }
         }
         try {
             // runTest
@@ -474,6 +481,8 @@ public synchronized void waitFinished(final int timeout) throws Throwable {
                     long now = System.nanoTime();
                     try {
                         runTest();
+                    } catch (AssumptionViolatedException ex) {
+                        // ignore, the test is assumed to be meaningless.
                     } catch (Throwable t) {
                         noteWorkDir(workdirNoCreate());
                         throw noteRandomness(t);

ide/libs.graalsdk.system/apichanges.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<?xml-stylesheet type="text/xml" href="CHANGEME/nbbuild/javadoctools/apichanges.xsl"?>
+<!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../../nbbuild/javadoctools/apichanges.dtd">
+
+
+<apichanges>
+    <apidefs>
+        <apidef name="GraalSDK">Graal SDK</apidef>
+    </apidefs>
+
+  <changes>
+      <change id="initial.version">
+          <api name="GraalSDK"/>
+          <summary>
+              Initial integration of Graal SDK
+          </summary>
+          <version major="1" minor="0"/>
+          <date day="1" month="2" year="2019"/>
+          <author login="jtulach"/>
+          <compatibility binary="compatible" source="compatible" addition="yes"/>
+          <description>
+              Bridge that plugs
+              <a href="https://graalvm.org">GraalVM</a> languages
+              into
+              <a href="@org-netbeans-api-scripting@/org/netbeans/api/scripting/Scripting.html">Scripting.createManager()</a>
+              to obtain enhanced version of
+              <a href="@JDK@/javax/script/ScriptEngineManager.html">ScriptEngineManager</a>.
+          </description>
+      </change>
+  </changes>
+
+    <!-- Now the surrounding HTML text and document structure: -->
+
+    <htmlcontents>
+<!--
+
+                            NO NO NO NO NO!
+
+         ==============>    DO NOT EDIT ME!  <==============
+
+          AUTOMATICALLY GENERATED FROM APICHANGES.XML, DO NOT EDIT
+
+                SEE CHANGEME/apichanges.xml
+
+-->
+    <head>
+      <title>Change History for the Progress API</title>
+      <link rel="stylesheet" href="prose.css" type="text/css"/>
+    </head>
+    <body>
+
+<p class="overviewlink"><a href="overview-summary.html">Overview</a></p>
+
+<h1>Introduction</h1>
+
+<p>This document lists changes made to the Progress API/SPI.</p>
+
+<!-- The actual lists of changes, as summaries and details: -->
+
+      <hr/><standard-changelists module-code-name="org.netbeans.api.progress"/>
+
+      <hr/><p>@FOOTER@</p>
+
+    </body>
+  </htmlcontents>
+
+</apichanges>