You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2020/03/19 20:11:26 UTC
[GitHub] [netbeans] errael opened a new pull request #2037: Ingore
module-info.java if on jdk1.8 or earlier.
errael opened a new pull request #2037: Ingore module-info.java if on jdk1.8 or earlier.
URL: https://github.com/apache/netbeans/pull/2037
Right now, when the JavaFX archetypes are used on JDK8, the whole source code is rendered as incompatible. The problem is that the bootclasspath is empty on JDK8 if there is `module-info.java` file. This PR ignores module-info.java with jdk1.8 or earlier. With this PR NetBeans show proper code completion for files `App.java` and `SystemInfo.java`.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] jlahoda commented on a change in pull request #2037:
Ignore module-info.java if on jdk1.8 or earlier.
Posted by GitBox <gi...@apache.org>.
jlahoda commented on a change in pull request #2037: Ignore module-info.java if on jdk1.8 or earlier.
URL: https://github.com/apache/netbeans/pull/2037#discussion_r395974773
##########
File path: java/maven/src/org/netbeans/modules/maven/classpath/ClassPathProviderImpl.java
##########
@@ -538,10 +539,17 @@ public ClassPath getActiveClassPath() {
if (ret == null) {
// see org.apache.maven.plugin.compiler.CompilerMojo.classpathElements
for (String sourceRoot : proj.getOriginalMavenProject().getCompileSourceRoots()) {
- if(new File(sourceRoot, MODULE_INFO_JAVA).exists()) {
- ret = hasModuleInfoCP.get();
+ final File moduleInfoFile = new File(sourceRoot, MODULE_INFO_JAVA);
Review comment:
Seems the new code is not setting "ret" at all, and this whole section now, at least at the first glance, seems to have no effect?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] JaroslavTulach commented on a change in pull request
#2037: Ignore module-info.java if on jdk1.8 or earlier.
Posted by GitBox <gi...@apache.org>.
JaroslavTulach commented on a change in pull request #2037: Ignore module-info.java if on jdk1.8 or earlier.
URL: https://github.com/apache/netbeans/pull/2037#discussion_r395454316
##########
File path: java/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPaths.java
##########
@@ -786,6 +787,12 @@ private static boolean hasModuleInfo(@NonNull final File file) {
newModuleInfos.add(moduleInfo);
if (found == null) {
found = FileUtil.toFileObject(moduleInfo);
+ if (found != null) {
+ String sourceLevel = SourceLevelQuery.getSourceLevel(found);
+ if (sourceLevel != null && sourceLevel.startsWith("1.")) { //NOI18N
+ found = null;
Review comment:
It would be good to cover this change with a test. I am not sure if `java.api.common` tests are actually executed by travis, but following would be my test:
```diffdiff --git a/java/java.api.common/test/unit/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPathsTest.java b/java/java.api.common/test/unit/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPathsTest.java
index b30f8246bdb7..1c0ba04a674a 100644
--- a/java/java.api.common/test/unit/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPathsTest.java
+++ b/java/java.api.common/test/unit/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPathsTest.java
@@ -46,6 +46,7 @@ import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import javax.lang.model.element.ModuleElement;
import javax.swing.event.ChangeListener;
+import org.junit.Assume;
import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.annotations.common.NullAllowed;
@@ -63,11 +64,14 @@ import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.java.api.common.TestJavaPlatform;
import org.netbeans.modules.java.api.common.TestProject;
import org.netbeans.modules.java.api.common.project.ProjectProperties;
+import org.netbeans.modules.java.classpath.SimpleClassPathImplementation;
import org.netbeans.modules.java.j2seplatform.platformdefinition.Util;
import org.netbeans.modules.java.source.BootClassPathUtil;
import org.netbeans.modules.parsing.api.indexing.IndexingManager;
import org.netbeans.spi.java.classpath.ClassPathFactory;
+import org.netbeans.spi.java.classpath.ClassPathImplementation;
import org.netbeans.spi.java.classpath.ClassPathProvider;
+import org.netbeans.spi.java.classpath.PathResourceImplementation;
import org.netbeans.spi.java.queries.CompilerOptionsQueryImplementation;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.EditableProperties;
@@ -178,6 +182,44 @@ public class ModuleClassPathsTest extends NbTestCase {
assertEquals(expectedURLs, resURLs);
}
+ public void testModuleInfoInJDK8Project() throws IOException {
+ assertNotNull(src);
+ createModuleInfo(src, "ModuleInfoDebris"); //NOI18N
+ setSourceLevel(tp, "1.8"); //NOI18N
+ final ClassPath base = systemModules == null ? ClassPath.EMPTY : systemModules;
+ final ClassPathImplementation mcp = ModuleClassPaths.createModuleInfoBasedPath(
+ base,
+ src,
+ base,
+ ClassPath.EMPTY,
+ null,
+ null
+ );
+ List<? extends PathResourceImplementation> resources = mcp.getResources();
+ assertEquals("No resources found as module-info.java is ignored: " + resources, 0, resources.size());
+ }
+
+ public void testModuleInfoInJDK11Project() throws IOException {
+ if (systemModules == null) {
+ System.out.println("No jdk 9 home configured."); //NOI18N
+ return;
+ }
+
+ assertNotNull(src);
+ createModuleInfo(src, "ModuleInfoUsed"); //NOI18N
+ final ClassPath base = systemModules;
+ final ClassPathImplementation mcp = ModuleClassPaths.createModuleInfoBasedPath(
+ base,
+ src,
+ base,
+ ClassPath.EMPTY,
+ null,
+ null
+ );
+ List<? extends PathResourceImplementation> one = mcp.getResources();
+ assertEquals("One resource found as module-info.java is used: " + one, 1, one.size());
+ }
+
public void testModuleInfoBasedCp_SystemModules_in_NamedModule() throws IOException {
if (systemModules == null) {
System.out.println("No jdk 9 home configured."); //NOI18N
```
I was able to successfully run it on JDK8:
```bash
java/java.api.common$ JAVA_HOME=$HOME/bin/jdk1.8.0 ant test -Dtest.includes=**/ModuleClassPathsTest.class
```
as well as on JDK11:
```bash
java/java.api.common$ JAVA_HOME=$HOME/bin/jdk-11 ant test -Dtest.includes=**/ModuleClassPathsTest.class -Dtest.nbjdk.home=$HOME/bin/jdk-11 -Dtest.run.args=--limit-modules=java.base,java.logging,java.xml,java.prefs,java.desktop,java.management,java.instrument,jdk.zipfs,java.scripting,java.naming -Dtest.bootclasspath.prepend.args=-Dno.netbeans.bootclasspath.prepend.needed=true
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] errael commented on issue #2037: Ingore module-info.java
if on jdk1.8 or earlier.
Posted by GitBox <gi...@apache.org>.
errael commented on issue #2037: Ingore module-info.java if on jdk1.8 or earlier.
URL: https://github.com/apache/netbeans/pull/2037#issuecomment-601393806
@jtulach could you review?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] jtulach commented on a change in pull request #2037:
Ignore module-info.java if on jdk1.8 or earlier.
Posted by GitBox <gi...@apache.org>.
jtulach commented on a change in pull request #2037: Ignore module-info.java if on jdk1.8 or earlier.
URL: https://github.com/apache/netbeans/pull/2037#discussion_r395959484
##########
File path: java/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPaths.java
##########
@@ -786,6 +787,12 @@ private static boolean hasModuleInfo(@NonNull final File file) {
newModuleInfos.add(moduleInfo);
if (found == null) {
found = FileUtil.toFileObject(moduleInfo);
+ if (found != null) {
+ String sourceLevel = SourceLevelQuery.getSourceLevel(found);
+ if (sourceLevel != null && sourceLevel.startsWith("1.")) { //NOI18N
+ found = null;
Review comment:
The `Do not know where to store build.properties` error seems harmless on Linux - the execution continues. Doing `ant test-generate-html` then shows no errors in the test charts.
I haven't seen the `SecurityException` on Linux. This is where @jlahoda has to step in. The `javac` situation (e.g. JDK11, JDK14, JDK... and `nbjavac`) is complicated (as recently discussed on mailing list). Setting things up to run on Linux properly hasn't been not easy for me either. I can only guess what can be wrong on Windows. The only three poorman's ideas I have: debug it, suppress security manager, remove the signing information from the JAR. Possibly also verify how the tests behave on Windows before the applying the changes - if they are broken, then it makes little sense to solve the problem in this issue.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] junichi11 commented on a change in pull request #2037:
Ingore module-info.java if on jdk1.8 or earlier.
Posted by GitBox <gi...@apache.org>.
junichi11 commented on a change in pull request #2037: Ingore module-info.java if on jdk1.8 or earlier.
URL: https://github.com/apache/netbeans/pull/2037#discussion_r395378386
##########
File path: java/maven/src/org/netbeans/modules/maven/classpath/ClassPathProviderImpl.java
##########
@@ -538,10 +539,17 @@ public ClassPath getActiveClassPath() {
if (ret == null) {
// see org.apache.maven.plugin.compiler.CompilerMojo.classpathElements
for (String sourceRoot : proj.getOriginalMavenProject().getCompileSourceRoots()) {
- if(new File(sourceRoot, MODULE_INFO_JAVA).exists()) {
- ret = hasModuleInfoCP.get();
+ final File moduleInfoFile = new File(sourceRoot, MODULE_INFO_JAVA);
+ if(moduleInfoFile.exists()) {
+ ClassPath useModuleInfoCP = hasModuleInfoCP.get();
LOGGER.log(Level.FINER, "ModuleInfoSelector {0} for project {1}: has module-info.java", new Object [] {logDesc, proj.getProjectDirectory().getPath()}); // NOI18N
- break;
+ if (useModuleInfoCP.findResource("java/lang/AssertionError.class") != null) {
+ FileObject moduleInfo = FileUtil.toFileObject(moduleInfoFile);
+ SourceLevelQuery.Result q = SourceLevelQuery.getSourceLevel2(moduleInfo);
+ if (!q.getSourceLevel().startsWith("1.")) {
Review comment:
Please add `// NOI18N` comment
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] junichi11 commented on a change in pull request #2037:
Ingore module-info.java if on jdk1.8 or earlier.
Posted by GitBox <gi...@apache.org>.
junichi11 commented on a change in pull request #2037: Ingore module-info.java if on jdk1.8 or earlier.
URL: https://github.com/apache/netbeans/pull/2037#discussion_r395378338
##########
File path: java/maven/src/org/netbeans/modules/maven/classpath/ClassPathProviderImpl.java
##########
@@ -538,10 +539,17 @@ public ClassPath getActiveClassPath() {
if (ret == null) {
// see org.apache.maven.plugin.compiler.CompilerMojo.classpathElements
for (String sourceRoot : proj.getOriginalMavenProject().getCompileSourceRoots()) {
- if(new File(sourceRoot, MODULE_INFO_JAVA).exists()) {
- ret = hasModuleInfoCP.get();
+ final File moduleInfoFile = new File(sourceRoot, MODULE_INFO_JAVA);
+ if(moduleInfoFile.exists()) {
+ ClassPath useModuleInfoCP = hasModuleInfoCP.get();
LOGGER.log(Level.FINER, "ModuleInfoSelector {0} for project {1}: has module-info.java", new Object [] {logDesc, proj.getProjectDirectory().getPath()}); // NOI18N
- break;
+ if (useModuleInfoCP.findResource("java/lang/AssertionError.class") != null) {
Review comment:
Please add `// NOI18N` comment
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] errael commented on a change in pull request #2037:
Ignore module-info.java if on jdk1.8 or earlier.
Posted by GitBox <gi...@apache.org>.
errael commented on a change in pull request #2037: Ignore module-info.java if on jdk1.8 or earlier.
URL: https://github.com/apache/netbeans/pull/2037#discussion_r396042183
##########
File path: java/maven/src/org/netbeans/modules/maven/classpath/ClassPathProviderImpl.java
##########
@@ -538,10 +539,17 @@ public ClassPath getActiveClassPath() {
if (ret == null) {
// see org.apache.maven.plugin.compiler.CompilerMojo.classpathElements
for (String sourceRoot : proj.getOriginalMavenProject().getCompileSourceRoots()) {
- if(new File(sourceRoot, MODULE_INFO_JAVA).exists()) {
- ret = hasModuleInfoCP.get();
+ final File moduleInfoFile = new File(sourceRoot, MODULE_INFO_JAVA);
Review comment:
Thanks @jlahoda , so this code "worked" when either (or both) the IDE and project used jdk1.8 since you don't want module-info.java to be used (AFAICT). There's a problem when both IDE and project are jdk-11, checking...
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] errael commented on a change in pull request #2037:
Ignore module-info.java if on jdk1.8 or earlier.
Posted by GitBox <gi...@apache.org>.
errael commented on a change in pull request #2037: Ignore module-info.java if on jdk1.8 or earlier.
URL: https://github.com/apache/netbeans/pull/2037#discussion_r395838686
##########
File path: java/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPaths.java
##########
@@ -786,6 +787,12 @@ private static boolean hasModuleInfo(@NonNull final File file) {
newModuleInfos.add(moduleInfo);
if (found == null) {
found = FileUtil.toFileObject(moduleInfo);
+ if (found != null) {
+ String sourceLevel = SourceLevelQuery.getSourceLevel(found);
+ if (sourceLevel != null && sourceLevel.startsWith("1.")) { //NOI18N
+ found = null;
Review comment:
I have successfully run the test on JDK8 using the command you show.
But for JDK11 my setup must have problems. I get lots of the following errors (many more of the 2nd)
```
[junit] SEVERE: null
[junit] java.io.IOException: Do not know where to store build.properties; must set netbeans.user!
```
and
```
[junit] Testcase: testPatchModuleWithDuplicates(org.netbeans.modules.java.api.common.classpath.ModuleClassPathsTest): Caused an ERROR
[junit] class "com.sun.tools.javac.code.Scope$WriteableScope"'s signer information does not match signer information of other classes in the same package
[junit] java.lang.SecurityException: class "com.sun.tools.javac.code.Scope$WriteableScope"'s signer information does not match signer information of other classes in the same package
[junit] at java.base/java.lang.ClassLoader.checkCerts(ClassLoader.java:1150)
[junit] at java.base/java.lang.ClassLoader.preDefineClass(ClassLoader.java:905)
```
I guessed it wanted a pointer to a userdir (there is a build.properties in there), so I tried the userdir I use when I run the repo build. I did both
`-Dnetbeans.user=C:/.../userdir` on the command line and `netbeans.user=C:/.../userdir` in user.build.properties. Neither worked.
For the time being I'm assuming the signature errors are because of netbeans.user not set. If that's not the case, that's the next hurdle.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] JaroslavTulach merged pull request #2037: Ignore
module-info.java if on jdk1.8 or earlier.
Posted by GitBox <gi...@apache.org>.
JaroslavTulach merged pull request #2037: Ignore module-info.java if on jdk1.8 or earlier.
URL: https://github.com/apache/netbeans/pull/2037
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] JaroslavTulach commented on a change in pull request
#2037: Ignore module-info.java if on jdk1.8 or earlier.
Posted by GitBox <gi...@apache.org>.
JaroslavTulach commented on a change in pull request #2037: Ignore module-info.java if on jdk1.8 or earlier.
URL: https://github.com/apache/netbeans/pull/2037#discussion_r395454316
##########
File path: java/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPaths.java
##########
@@ -786,6 +787,12 @@ private static boolean hasModuleInfo(@NonNull final File file) {
newModuleInfos.add(moduleInfo);
if (found == null) {
found = FileUtil.toFileObject(moduleInfo);
+ if (found != null) {
+ String sourceLevel = SourceLevelQuery.getSourceLevel(found);
+ if (sourceLevel != null && sourceLevel.startsWith("1.")) { //NOI18N
+ found = null;
Review comment:
It would be good to cover this change with a test. I am not sure if `java.api.common` tests are actually executed by travis, but following would be my test:
```diff
diff --git a/java/java.api.common/test/unit/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPathsTest.java b/java/java.api.common/test/unit/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPathsTest.java
index b30f8246bdb7..1c0ba04a674a 100644
--- a/java/java.api.common/test/unit/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPathsTest.java
+++ b/java/java.api.common/test/unit/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPathsTest.java
@@ -46,6 +46,7 @@ import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import javax.lang.model.element.ModuleElement;
import javax.swing.event.ChangeListener;
+import org.junit.Assume;
import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.annotations.common.NullAllowed;
@@ -63,11 +64,14 @@ import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.java.api.common.TestJavaPlatform;
import org.netbeans.modules.java.api.common.TestProject;
import org.netbeans.modules.java.api.common.project.ProjectProperties;
+import org.netbeans.modules.java.classpath.SimpleClassPathImplementation;
import org.netbeans.modules.java.j2seplatform.platformdefinition.Util;
import org.netbeans.modules.java.source.BootClassPathUtil;
import org.netbeans.modules.parsing.api.indexing.IndexingManager;
import org.netbeans.spi.java.classpath.ClassPathFactory;
+import org.netbeans.spi.java.classpath.ClassPathImplementation;
import org.netbeans.spi.java.classpath.ClassPathProvider;
+import org.netbeans.spi.java.classpath.PathResourceImplementation;
import org.netbeans.spi.java.queries.CompilerOptionsQueryImplementation;
import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.support.ant.EditableProperties;
@@ -178,6 +182,44 @@ public class ModuleClassPathsTest extends NbTestCase {
assertEquals(expectedURLs, resURLs);
}
+ public void testModuleInfoInJDK8Project() throws IOException {
+ assertNotNull(src);
+ createModuleInfo(src, "ModuleInfoDebris"); //NOI18N
+ setSourceLevel(tp, "1.8"); //NOI18N
+ final ClassPath base = systemModules == null ? ClassPath.EMPTY : systemModules;
+ final ClassPathImplementation mcp = ModuleClassPaths.createModuleInfoBasedPath(
+ base,
+ src,
+ base,
+ ClassPath.EMPTY,
+ null,
+ null
+ );
+ List<? extends PathResourceImplementation> resources = mcp.getResources();
+ assertEquals("No resources found as module-info.java is ignored: " + resources, 0, resources.size());
+ }
+
+ public void testModuleInfoInJDK11Project() throws IOException {
+ if (systemModules == null) {
+ System.out.println("No jdk 9 home configured."); //NOI18N
+ return;
+ }
+
+ assertNotNull(src);
+ createModuleInfo(src, "ModuleInfoUsed"); //NOI18N
+ final ClassPath base = systemModules;
+ final ClassPathImplementation mcp = ModuleClassPaths.createModuleInfoBasedPath(
+ base,
+ src,
+ base,
+ ClassPath.EMPTY,
+ null,
+ null
+ );
+ List<? extends PathResourceImplementation> one = mcp.getResources();
+ assertEquals("One resource found as module-info.java is used: " + one, 1, one.size());
+ }
+
public void testModuleInfoBasedCp_SystemModules_in_NamedModule() throws IOException {
if (systemModules == null) {
System.out.println("No jdk 9 home configured."); //NOI18N
```
I was able to successfully run it on JDK8:
```bash
java/java.api.common$ JAVA_HOME=$HOME/bin/jdk1.8.0 ant test -Dtest.includes=**/ModuleClassPathsTest.class
```
as well as on JDK11:
```bash
java/java.api.common$ JAVA_HOME=$HOME/bin/jdk-11 ant test -Dtest.includes=**/ModuleClassPathsTest.class -Dtest.nbjdk.home=$HOME/bin/jdk-11 -Dtest.run.args=--limit-modules=java.base,java.logging,java.xml,java.prefs,java.desktop,java.management,java.instrument,jdk.zipfs,java.scripting,java.naming -Dtest.bootclasspath.prepend.args=-Dno.netbeans.bootclasspath.prepend.needed=true
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] junichi11 commented on a change in pull request #2037:
Ingore module-info.java if on jdk1.8 or earlier.
Posted by GitBox <gi...@apache.org>.
junichi11 commented on a change in pull request #2037: Ingore module-info.java if on jdk1.8 or earlier.
URL: https://github.com/apache/netbeans/pull/2037#discussion_r395393825
##########
File path: java/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPaths.java
##########
@@ -786,6 +787,12 @@ private static boolean hasModuleInfo(@NonNull final File file) {
newModuleInfos.add(moduleInfo);
if (found == null) {
found = FileUtil.toFileObject(moduleInfo);
+ if (found != null) {
+ String sourceLevel = SourceLevelQuery.getSourceLevel(found);
+ if (sourceLevel != null && sourceLevel.startsWith("1.")) {
Review comment:
@errael Thank you :) I've just checked code style.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] junichi11 commented on a change in pull request #2037:
Ingore module-info.java if on jdk1.8 or earlier.
Posted by GitBox <gi...@apache.org>.
junichi11 commented on a change in pull request #2037: Ingore module-info.java if on jdk1.8 or earlier.
URL: https://github.com/apache/netbeans/pull/2037#discussion_r395378239
##########
File path: java/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPaths.java
##########
@@ -786,6 +787,12 @@ private static boolean hasModuleInfo(@NonNull final File file) {
newModuleInfos.add(moduleInfo);
if (found == null) {
found = FileUtil.toFileObject(moduleInfo);
+ if (found != null) {
+ String sourceLevel = SourceLevelQuery.getSourceLevel(found);
+ if (sourceLevel != null && sourceLevel.startsWith("1.")) {
Review comment:
Please add `// NOI18N` comment
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[GitHub] [netbeans] jlahoda commented on a change in pull request #2037:
Ignore module-info.java if on jdk1.8 or earlier.
Posted by GitBox <gi...@apache.org>.
jlahoda commented on a change in pull request #2037: Ignore module-info.java if on jdk1.8 or earlier.
URL: https://github.com/apache/netbeans/pull/2037#discussion_r395974692
##########
File path: java/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPaths.java
##########
@@ -786,6 +787,12 @@ private static boolean hasModuleInfo(@NonNull final File file) {
newModuleInfos.add(moduleInfo);
if (found == null) {
found = FileUtil.toFileObject(moduleInfo);
+ if (found != null) {
+ String sourceLevel = SourceLevelQuery.getSourceLevel(found);
+ if (sourceLevel != null && sourceLevel.startsWith("1.")) { //NOI18N
+ found = null;
Review comment:
I'll investigate the JDK 11 problem later. But I wonder if this change is needed at all? I mean - this is all in a section where system module are available, and the resulting ClassPath should be more or less reasonable even if the module-info is considered, shouldn't it?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists