This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 4264b9a JavaHelp classes aren't by default provided by the JavaHelp
module
4264b9a is described below
commit 4264b9ad52883a3f699cdea0ebecfefcea5105ca
Author: Jaroslav Tulach <jaroslav.tul...@oracle.com>
AuthorDate: Sat Dec 30 12:23:08 2017 +0100
JavaHelp classes aren't by default provided by the JavaHelp module
---
core.osgi/nbproject/project.properties | 3 ++-
core.osgi/test/unit/src/org/netbeans/core/osgi/ActivatorTest.java | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/core.osgi/nbproject/project.properties
b/core.osgi/nbproject/project.properties
index 0624d2c..d805b29 100644
--- a/core.osgi/nbproject/project.properties
+++ b/core.osgi/nbproject/project.properties
@@ -22,7 +22,8 @@ cp.extra=\
${nb_all}/libs.osgi/external/osgi.cmpn-4.2.jar
test.unit.cp.extra=\
${ant.core.lib}:\
- ${nbantext.jar}
+ ${nbantext.jar}:\
+ ${nb_all}/javahelp/external/jhall-2.0_05.jar
test-unit-sys-prop.java.awt.headless=true
test-unit-sys-prop.platform.dir=${cluster}
#test.filter.trace=false
diff --git a/core.osgi/test/unit/src/org/netbeans/core/osgi/ActivatorTest.java
b/core.osgi/test/unit/src/org/netbeans/core/osgi/ActivatorTest.java
index bba5c15..5027865 100644
--- a/core.osgi/test/unit/src/org/netbeans/core/osgi/ActivatorTest.java
+++ b/core.osgi/test/unit/src/org/netbeans/core/osgi/ActivatorTest.java
@@ -227,8 +227,8 @@ public class ActivatorTest extends NbTestCase {
"public class Install extends
org.openide.modules.ModuleInstall {",
"public @Override void restored() {",
"org.netbeans.api.javahelp.Help.class.hashCode();",
- "javax.help.HelpSet.class.hashCode();",
- "javax.help.event.HelpSetEvent.class.hashCode();",
+ // "javax.help.HelpSet.class.hashCode();",
+ // "javax.help.event.HelpSetEvent.class.hashCode();",
"System.setProperty(\"used.javahelp\", \"true\");}",
"}").manifest(
"OpenIDE-Module: custom",
--
To stop receiving notification emails like this one, please contact
['"commits@netbeans.apache.org" <commits@netbeans.apache.org>'].
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
