JaroslavTulach closed pull request #1072: Improving ability of o.n.core tests
to pass on JDK 11.
URL: https://github.com/apache/incubator-netbeans/pull/1072
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/platform/o.n.bootstrap/test/unit/src/org/netbeans/SetupHid.java
b/platform/o.n.bootstrap/test/unit/src/org/netbeans/SetupHid.java
index cbbad9732c..d748864a9d 100644
--- a/platform/o.n.bootstrap/test/unit/src/org/netbeans/SetupHid.java
+++ b/platform/o.n.bootstrap/test/unit/src/org/netbeans/SetupHid.java
@@ -321,7 +321,7 @@ private static void compile(List<String> options,
Iterable<File> files) throws I
JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
StandardJavaFileManager mgr = compiler.getStandardFileManager(null,
null, null);
List<String> fullOptions = new ArrayList<String>(options);
- fullOptions.addAll(Arrays.asList("-source", "6", "-target", "6"));
+ fullOptions.addAll(Arrays.asList("-source", "8", "-target", "8"));
if (!compiler.getTask(null, mgr, null, fullOptions, null,
mgr.getJavaFileObjectsFromFiles(files)).call()) {
throw new IOException("compilation failed");
}
diff --git a/platform/o.n.core/nbproject/project.properties
b/platform/o.n.core/nbproject/project.properties
index 034cfcc671..434bd0d915 100644
--- a/platform/o.n.core/nbproject/project.properties
+++ b/platform/o.n.core/nbproject/project.properties
@@ -19,8 +19,6 @@ javac.compilerargs=-Xlint:unchecked
javac.source=1.7
javac.target=1.7
-requires.nb.javac=true
-
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
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
