You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by db...@apache.org on 2023/01/13 07:25:52 UTC
[netbeans] branch master updated: Issue #5250: Update java.mx.project to work with GraalVM 22.3.0 release. (#5285)
This is an automated email from the ASF dual-hosted git repository.
dbalek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 312e6a43af Issue #5250: Update java.mx.project to work with GraalVM 22.3.0 release. (#5285)
312e6a43af is described below
commit 312e6a43af76c538be13bd53da0849562069e23b
Author: Dusan Balek <du...@oracle.com>
AuthorDate: Fri Jan 13 08:25:45 2023 +0100
Issue #5250: Update java.mx.project to work with GraalVM 22.3.0 release. (#5285)
---
.github/workflows/main.yml | 2 +-
java/java.mx.project/build.xml | 32 ++++++----------------
.../modules/java/mx/project/SuiteProject.java | 2 +-
.../modules/java/mx/project/ParseSuitesTest.java | 2 +-
.../java/mx/project/SuiteActionProviderTest.java | 2 +-
.../modules/java/mx/project/SuiteCheck.java | 2 +-
6 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 665387721d..9ea07434ff 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -692,7 +692,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
- java: [ '8' ]
+ java: [ '11' ]
steps:
- name: Set up JDK ${{ matrix.java }}
diff --git a/java/java.mx.project/build.xml b/java/java.mx.project/build.xml
index 86d4236da0..bbd780a0f1 100644
--- a/java/java.mx.project/build.xml
+++ b/java/java.mx.project/build.xml
@@ -26,38 +26,22 @@
<target name="-checkout-graalvm" unless="graal.dir.available">
<delete dir="${graal.dir}"/>
- <mkdir dir="${graal.dir}"/>
-
- <!-- Avoid git-clone of the full Graal repository -->
- <exec dir="${graal.dir}" executable="git" failonerror="true">
- <arg value="init"/>
- </exec>
- <exec dir="${graal.dir}" executable="git" failonerror="true">
- <arg value="remote"/>
- <arg value="add"/>
- <arg value="origin"/>
+ <mkdir dir="${graal.dir}/.."/>
+ <exec dir="${graal.dir}/.." executable="git" failonerror="true">
+ <arg value="clone"/>
+ <arg value="--depth=1"/>
+ <arg value="--branch"/>
+ <arg value="vm-22.3.0"/>
+ <arg value="--single-branch"/>
<arg value="https://github.com/oracle/graal"/>
</exec>
- <echo message="Fetching GraalVM revision from https://github.com/oracle/graal"/>
- <exec dir="${graal.dir}" executable="git" failonerror="true">
- <arg value="fetch"/>
- <arg value="origin"/>
- <!-- The commit ID corresponds to a removed tag vm-20.3.0, by Gilles Duboscq, message "Release 20.3.0", Thu Nov 12 22:49:14 -->
- <arg value="c5ff5a5a091bfd974640aaf6fbe51c81bd080438"/>
- </exec>
- <exec dir="${graal.dir}" executable="git" failonerror="true">
- <arg value="reset"/>
- <arg value="--hard"/>
- <arg value="FETCH_HEAD"/>
- </exec>
-
<delete dir="${mx.dir}"/>
<mkdir dir="${mx.dir}/.."/>
<exec dir="${mx.dir}/.." executable="git" failonerror="true">
<arg value="clone"/>
<arg value="--depth=1"/>
<arg value="--branch"/>
- <arg value="5.279.0"/>
+ <arg value="6.7.0"/>
<arg value="--single-branch"/>
<arg value="https://github.com/graalvm/mx"/>
</exec>
diff --git a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteProject.java b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteProject.java
index 494a4128de..ee4e4b55d5 100644
--- a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteProject.java
+++ b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteProject.java
@@ -114,7 +114,7 @@ final class SuiteProject implements Project {
private CompilerOptionsQueryImplementation.Result RESULT = new Result() {
@Override
public List<? extends String> getArguments() {
- return Arrays.asList("--add-modules", "ALL-MODULE-PATH", "--limit-modules", "java.se");
+ return Arrays.asList("--add-modules", "ALL-MODULE-PATH", "--limit-modules", "java.se,jdk.unsupported,jdk.management");
}
@Override
diff --git a/java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/ParseSuitesTest.java b/java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/ParseSuitesTest.java
index cd894d340e..9c53905162 100644
--- a/java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/ParseSuitesTest.java
+++ b/java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/ParseSuitesTest.java
@@ -37,7 +37,7 @@ public final class ParseSuitesTest extends NbTestCase {
}
public void testParseThemAll() throws IOException {
- assertSuitePys(getDataDir(), 14);
+ assertSuitePys(getDataDir(), 15);
}
public static void main(String... args) throws IOException {
diff --git a/java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/SuiteActionProviderTest.java b/java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/SuiteActionProviderTest.java
index 95b8a2de25..b6637779b1 100644
--- a/java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/SuiteActionProviderTest.java
+++ b/java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/SuiteActionProviderTest.java
@@ -91,7 +91,7 @@ public class SuiteActionProviderTest extends SuiteCheck {
ap.invokeAction(ActionProvider.COMMAND_BUILD, ctx);
assertTrue("Progress started", progress.started);
- progress.finished.await(45, TimeUnit.SECONDS);
+ progress.finished.await(600, TimeUnit.SECONDS);
assertNotNull("Progress finished", progress.success);
}
diff --git a/java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/SuiteCheck.java b/java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/SuiteCheck.java
index ff1dd94d5f..af0e918157 100644
--- a/java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/SuiteCheck.java
+++ b/java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/SuiteCheck.java
@@ -135,7 +135,7 @@ abstract class SuiteCheck extends NbTestCase {
for (SourceGroup sourceGroup : src.getSourceGroups("java")) {
if (sourceGroup instanceof Compliance.Provider) {
Compliance c = ((Compliance.Provider) sourceGroup).getCompliance();
- if (!c.includes(8)) {
+ if (!c.includes(11)) {
log(Level.INFO, "Skipping check of %s with compliance %s", sourceGroup, c);
continue;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists