Skip to content

[24.2] Merge upstream release/graal-vm/24.2 branch into mandrel/24.2 #858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: mandrel/24.2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/mandrel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
repo: ${{ github.repository }}
version: ${{ github.ref }}
mandrel-packaging-version: "24.2"
jdk: "24/ga"
jdk: "24/ea"
q-main-ea-win:
name: "Q main M 24.2 windows EA"
uses: ./.github/workflows/base-windows.yml
Expand All @@ -44,4 +44,4 @@ jobs:
repo: ${{ github.repository }}
version: ${{ github.ref }}
mandrel-packaging-version: "24.2"
jdk: "24/ga"
jdk: "24/ea"
4 changes: 2 additions & 2 deletions compiler/mx.compiler/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"sourceinprojectwhitelist" : [],

"groupId" : "org.graalvm.compiler",
"version" : "24.2.1.0",
"release" : True,
"version" : "24.2.2.0",
"release" : False,
"url" : "http://www.graalvm.org/",
"developer" : {
"name" : "GraalVM Development",
Expand Down
4 changes: 2 additions & 2 deletions espresso/mx.espresso/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
suite = {
"mxversion": "7.33.0",
"name": "espresso",
"version" : "24.2.1.0",
"release" : True,
"version" : "24.2.2.0",
"release" : False,
"groupId" : "org.graalvm.espresso",
"url" : "https://www.graalvm.org/reference-manual/java-on-truffle/",
"developer" : {
Expand Down
4 changes: 2 additions & 2 deletions regex/mx.regex/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@

"name" : "regex",

"version" : "24.2.1.0",
"release" : True,
"version" : "24.2.2.0",
"release" : False,
"groupId" : "org.graalvm.regex",
"url" : "http://www.graalvm.org/",
"developer" : {
Expand Down
4 changes: 2 additions & 2 deletions sdk/mx.sdk/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
suite = {
"mxversion": "7.33.1",
"name" : "sdk",
"version" : "24.2.1.0",
"release" : True,
"version" : "24.2.2.0",
"release" : False,
"sourceinprojectwhitelist" : [],
"url" : "https://github.com/oracle/graal",
"groupId" : "org.graalvm.sdk",
Expand Down
4 changes: 2 additions & 2 deletions substratevm/mx.substratevm/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
suite = {
"mxversion": "7.33.1",
"name": "substratevm",
"version" : "24.2.1.0",
"release" : True,
"version" : "24.2.2.0",
"release" : False,
"url" : "https://github.com/oracle/graal/tree/master/substratevm",

"groupId" : "org.graalvm.nativeimage",
Expand Down
4 changes: 2 additions & 2 deletions sulong/mx.sulong/suite.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
suite = {
"mxversion": "7.33.0",
"name" : "sulong",
"version" : "24.2.1.0",
"release" : True,
"version" : "24.2.2.0",
"release" : False,
"versionConflictResolution" : "latest",
"groupId": "org.graalvm.llvm",
"url": "http://www.graalvm.org/",
Expand Down
4 changes: 2 additions & 2 deletions tools/mx.tools/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"defaultLicense" : "GPLv2-CPE",

"groupId" : "org.graalvm.tools",
"version" : "24.2.1.0",
"release" : True,
"version" : "24.2.2.0",
"release" : False,
"url" : "http://openjdk.java.net/projects/graal",
"developer" : {
"name" : "GraalVM Development",
Expand Down
2 changes: 1 addition & 1 deletion truffle/external_repos/simplelanguage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
<graalvm.version>24.2.1-dev</graalvm.version>
<graalvm.version>24.2.2-dev</graalvm.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<launcherClass>org.graalvm.sl.launcher/com.oracle.truffle.sl.launcher.SLMain</launcherClass>
Expand Down
2 changes: 1 addition & 1 deletion truffle/external_repos/simpletool/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<version>${graalvm.version}</version>
<name>simpletool</name>
<properties>
<graalvm.version>24.2.1-dev</graalvm.version>
<graalvm.version>24.2.2-dev</graalvm.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
Expand Down
4 changes: 2 additions & 2 deletions truffle/mx.truffle/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
suite = {
"mxversion": "7.33.0",
"name" : "truffle",
"version" : "24.2.1.0",
"release" : True,
"version" : "24.2.2.0",
"release" : False,
"groupId" : "org.graalvm.truffle",
"sourceinprojectwhitelist" : [],
"url" : "http://openjdk.java.net/projects/graal",
Expand Down
10 changes: 5 additions & 5 deletions vm/mx.vm/suite.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
suite = {
"name": "vm",
"version" : "24.2.1.0",
"version" : "24.2.2.0",
"mxversion": "7.34.1",
"release" : True,
"release" : False,
"groupId" : "org.graalvm",

"url" : "http://www.graalvm.org/",
Expand Down Expand Up @@ -33,7 +33,7 @@
"name": "graal-nodejs",
"subdir": True,
"dynamic": True,
"version": "8b086b096e32a1727c8c584b9e67181dfe343289",
"version": "7ae8a3a8eba6521e0ef16c9502f92e417a8b9394",
"urls" : [
{"url" : "https://github.com/graalvm/graaljs.git", "kind" : "git"},
]
Expand All @@ -42,7 +42,7 @@
"name": "graal-js",
"subdir": True,
"dynamic": True,
"version": "8b086b096e32a1727c8c584b9e67181dfe343289",
"version": "7ae8a3a8eba6521e0ef16c9502f92e417a8b9394",
"urls": [
{"url": "https://github.com/graalvm/graaljs.git", "kind" : "git"},
]
Expand All @@ -65,7 +65,7 @@
},
{
"name": "graalpython",
"version": "abd391210a10593c7e35c132a2894dcfe8755798",
"version": "7d196446914364f49ebff17434d0ccd10753df5e",
"dynamic": True,
"urls": [
{"url": "https://github.com/graalvm/graalpython.git", "kind": "git"},
Expand Down
4 changes: 2 additions & 2 deletions wasm/mx.wasm/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
"mxversion": "7.33.0",
"name" : "wasm",
"groupId" : "org.graalvm.wasm",
"version" : "24.2.1.0",
"release" : True,
"version" : "24.2.2.0",
"release" : False,
"versionConflictResolution" : "latest",
"url" : "http://graalvm.org/webassembly",
"developer" : {
Expand Down