Skip to content

Commit 96efc48

Browse files
ansalondansalond
committed
[GR-52782] Remove project definitions that hardcode GraalVM versions in pom files.
PullRequest: graalpython/3271
2 parents 2ff2ae7 + 484b0ed commit 96efc48

File tree

11 files changed

+25
-43
lines changed

11 files changed

+25
-43
lines changed

‎ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "overlay": "f16fa2aa94ce79d7d0c59e570d59f3adef8fd1a1" }
1+
{ "overlay": "5b5fbd59f8657832154426ae91262524e744acc8" }

‎graalpython/com.oracle.graal.python.test.integration/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Additionally, one can change the polyglot artifacts version with
6464
<maven.compiler.source>17</maven.compiler.source>
6565
<maven.compiler.target>17</maven.compiler.target>
6666
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
67-
<com.oracle.graal.python.test.polyglot.version>24.0.0-dev</com.oracle.graal.python.test.polyglot.version>
67+
<com.oracle.graal.python.test.polyglot.version>24.0.1-dev</com.oracle.graal.python.test.polyglot.version>
6868
</properties>
6969

7070
<build>

‎graalpython/com.oracle.graal.python.test/src/tests/standalone/test_standalone.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ def get_graalvm_version():
109109
return graalvmVersion
110110

111111

112+
@unittest.skipUnless(False, "CPU release")
112113
class PolyglotAppTest(unittest.TestCase):
113114

114115
def setUpClass(self):

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2023, Oracle and/or its affiliates.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates.
33
* Copyright (c) 2015, Regents of the University of California
44
*
55
* All rights reserved.

‎graalpython/graalpy-archetype-polyglot-app/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ SOFTWARE.
4444

4545
<groupId>org.graalvm.python</groupId>
4646
<artifactId>graalpy-archetype-polyglot-app</artifactId>
47-
<version>24.0.0</version>
47+
<version>24.0.1</version>
4848
<packaging>maven-archetype</packaging>
4949

5050
<properties>

‎graalpython/graalpy-archetype-polyglot-app/src/main/resources/archetype-resources/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#set( $symbol_dollar = '$' )
1212
<properties>
13-
<graalpy.version>24.0.0</graalpy.version>
13+
<graalpy.version>24.0.1</graalpy.version>
1414
<graalpy.edition>python-community</graalpy.edition>
1515
<maven.compiler.target>17</maven.compiler.target>
1616
<maven.compiler.source>17</maven.compiler.source>

‎graalpython/graalpy-jbang/examples/hello.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -40,10 +40,10 @@
4040
*/
4141
///usr/bin/env jbang "$0" "$@" ; exit $?
4242

43-
//DEPS org.graalvm.python:python-language:24.0.0
44-
//DEPS org.graalvm.python:python-resources:24.0.0
45-
//DEPS org.graalvm.python:python-launcher:24.0.0
46-
//DEPS org.graalvm.python:python-embedding:24.0.0
43+
//DEPS org.graalvm.python:python-language:24.0.1
44+
//DEPS org.graalvm.python:python-resources:24.0.1
45+
//DEPS org.graalvm.python:python-launcher:24.0.1
46+
//DEPS org.graalvm.python:python-embedding:24.0.1
4747
//PIP termcolor
4848

4949
import org.graalvm.polyglot.Context;

‎graalpython/graalpy-jbang/templates/graalpy-template.java.qute

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
{/for}
55
{#if dependencies.isEmpty()}// //DEPS <dependency1> <dependency2>{/if}
66

7-
//DEPS org.graalvm.python:python-language:24.0.0
8-
//DEPS org.graalvm.python:python-resources:24.0.0
9-
//DEPS org.graalvm.python:python-launcher:24.0.0
10-
//DEPS org.graalvm.python:python-embedding:24.0.0
7+
//DEPS org.graalvm.python:python-language:24.0.1
8+
//DEPS org.graalvm.python:python-resources:24.0.1
9+
//DEPS org.graalvm.python:python-launcher:24.0.1
10+
//DEPS org.graalvm.python:python-embedding:24.0.1
1111
//PIP termcolor
1212

1313
import org.graalvm.polyglot.Context;

‎graalpython/graalpy-jbang/templates/graalpy-template_local_repo.java.qute

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
//REPOS mc=https://repo1.maven.org/maven2/
88
//REPOS local=file://{path_to_local_repo}
9-
//DEPS org.graalvm.python:python-language:24.0.0
10-
//DEPS org.graalvm.python:python-resources:24.0.0
11-
//DEPS org.graalvm.python:python-launcher:24.0.0
12-
//DEPS org.graalvm.python:python-embedding:24.0.0
9+
//DEPS org.graalvm.python:python-language:24.0.1
10+
//DEPS org.graalvm.python:python-resources:24.0.1
11+
//DEPS org.graalvm.python:python-launcher:24.0.1
12+
//DEPS org.graalvm.python:python-embedding:24.0.1
1313
//PIP termcolor
1414

1515
import org.graalvm.polyglot.Context;

‎graalpython/graalpy-maven-plugin/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ SOFTWARE.
4747
<groupId>org.graalvm.python</groupId>
4848
<artifactId>graalpy-maven-plugin</artifactId>
4949
<packaging>maven-plugin</packaging>
50-
<version>24.0.0</version>
50+
<version>24.0.1</version>
5151
<name>graalpy-maven-plugin</name>
5252

5353
<properties>
5454
<maven.compiler.target>17</maven.compiler.target>
5555
<maven.compiler.source>17</maven.compiler.source>
5656
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
57-
<graalpy.version>24.0.0</graalpy.version>
57+
<graalpy.version>24.0.1</graalpy.version>
5858
</properties>
5959

6060
<build>

‎mx.graalpython/suite.py

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -45,31 +45,31 @@
4545
},
4646
{
4747
"name": "sdk",
48-
"version": "8a010c6c2d3886237cceaf12d3f9966503a0e5a6",
48+
"version": "bf0bb9bbfe346fe1b0868a56790e4d3fb9f0392e",
4949
"subdir": True,
5050
"urls": [
5151
{"url": "https://github.com/oracle/graal", "kind": "git"},
5252
]
5353
},
5454
{
5555
"name": "tools",
56-
"version": "8a010c6c2d3886237cceaf12d3f9966503a0e5a6",
56+
"version": "bf0bb9bbfe346fe1b0868a56790e4d3fb9f0392e",
5757
"subdir": True,
5858
"urls": [
5959
{"url": "https://github.com/oracle/graal", "kind": "git"},
6060
],
6161
},
6262
{
6363
"name": "sulong",
64-
"version": "8a010c6c2d3886237cceaf12d3f9966503a0e5a6",
64+
"version": "bf0bb9bbfe346fe1b0868a56790e4d3fb9f0392e",
6565
"subdir": True,
6666
"urls": [
6767
{"url": "https://github.com/oracle/graal", "kind": "git"},
6868
]
6969
},
7070
{
7171
"name": "regex",
72-
"version": "8a010c6c2d3886237cceaf12d3f9966503a0e5a6",
72+
"version": "bf0bb9bbfe346fe1b0868a56790e4d3fb9f0392e",
7373
"subdir": True,
7474
"urls": [
7575
{"url": "https://github.com/oracle/graal", "kind": "git"},
@@ -1396,24 +1396,5 @@
13961396
},
13971397
"maven": False,
13981398
},
1399-
1400-
"graalpy-archetype-polyglot-app": {
1401-
"class": "MavenProject",
1402-
"subDir": "graalpython",
1403-
"noMavenJavadoc": True,
1404-
"maven": {
1405-
"tag": ["default", "public"],
1406-
},
1407-
},
1408-
1409-
"graalpy-maven-plugin": {
1410-
"class": "MavenProject",
1411-
"subDir": "graalpython",
1412-
"noMavenJavadoc": True,
1413-
"dependencies": ["GRAALPYTHON_EMBEDDING"],
1414-
"maven": {
1415-
"tag": ["default", "public"],
1416-
},
1417-
},
14181399
},
14191400
}

0 commit comments

Comments
 (0)