geertjanw closed pull request #347: Fixing
org.netbeans.modules.openide.awt.ActionProcessorTest - ensurin?
URL: https://github.com/apache/incubator-netbeans/pull/347
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/nbbuild/templates/projectized.xml
b/nbbuild/templates/projectized.xml
index b4fa3193f..0ef036468 100644
--- a/nbbuild/templates/projectized.xml
+++ b/nbbuild/templates/projectized.xml
@@ -172,7 +172,7 @@ If you are sure you want to build with JDK 9+ anyway, use:
-Dpermit.jdk9.builds=
<property name="locmakenbm.brands" value="${brandings}"/>
<!-- When requires.nb.javac property is true, prepend javac-api and
javac-impl on bootclasspath to allow override the default annotation
processing API located in rt.jar. -->
- <property name="bootclasspath.prepend.nb"
value="${nb_all}/nbbuild/external/vanilla-javac-api.jar:${nb_all}/nbbuild/external/nb-javac-impl.jar"
/>
+ <property name="bootclasspath.prepend.nb"
value="${nb_all}/libs.javacapi/external/nb-javac-9-api.jar:${nb_all}/libs.javacimpl/external/nb-javac-9-impl.jar"
/>
<property name="bootclasspath.prepend.vanilla"
value="${nb_all}/nbbuild/external/vanilla-javac-api.jar:${nb_all}/nbbuild/external/vanilla-javac-impl.jar"
/>
<condition property="bootclasspath.prepend"
value="${bootclasspath.prepend.nb}">
<istrue value="${requires.nb.javac.impl}"/>
diff --git a/openide.awt/nbproject/project.properties
b/openide.awt/nbproject/project.properties
index bea5b7605..711d60e95 100644
--- a/openide.awt/nbproject/project.properties
+++ b/openide.awt/nbproject/project.properties
@@ -20,7 +20,6 @@ javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.6
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
-requires.nb.javac=true
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
----------------------------------------------------------------
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
