diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e1adfe4ae..16a41025c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ language runtime. The main focus is on user-observable behavior of the engine. ** running example via `jbang hello@oracle/graalpython` or `jbang hello@oracle/graalpython "print(1*4)"` ** creating new script via: `jbang init --template=graalpy@oracle/graalpython myscript.java` ** creating new script with local maven repo for testing: `jbang init --template=graalpy_local_repo@oracle/graalpython -Dpath_to_local_repo=/absolute/path/to/local/maven/repository myscript.java' +* Updated developer metadata of Maven artifacts. ## Version 23.1.0 * Oracle GraalPy distributions (previously known as GraalPy Enterprise) are now available under the [GFTC license](https://www.oracle.com/downloads/licenses/graal-free-license.html). The community builds published on Github have been renamed to `graalpy-community---.tar.gz`. diff --git a/ci.jsonnet b/ci.jsonnet index 0ac59f9a2c..bc98bedf73 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -1 +1 @@ -{ "overlay": "5b5fbd59f8657832154426ae91262524e744acc8" } +{ "overlay": "387f21c181437260b3f4f66cb4595a09c2b0040e" } diff --git a/graalpython/com.oracle.graal.python.test.integration/pom.xml b/graalpython/com.oracle.graal.python.test.integration/pom.xml index 39e6d01bd1..50718eb0ac 100644 --- a/graalpython/com.oracle.graal.python.test.integration/pom.xml +++ b/graalpython/com.oracle.graal.python.test.integration/pom.xml @@ -64,7 +64,7 @@ Additionally, one can change the polyglot artifacts version with 17 17 UTF-8 - 24.0.1-dev + 24.0.2-dev diff --git a/graalpython/graalpy-archetype-polyglot-app/pom.xml b/graalpython/graalpy-archetype-polyglot-app/pom.xml index c27f3fa9cd..ed9ba8d90f 100644 --- a/graalpython/graalpy-archetype-polyglot-app/pom.xml +++ b/graalpython/graalpy-archetype-polyglot-app/pom.xml @@ -44,7 +44,7 @@ SOFTWARE. org.graalvm.python graalpy-archetype-polyglot-app - 24.0.1 + 24.0.2 maven-archetype diff --git a/graalpython/graalpy-archetype-polyglot-app/src/main/resources/archetype-resources/pom.xml b/graalpython/graalpy-archetype-polyglot-app/src/main/resources/archetype-resources/pom.xml index 15636d2af3..f4649bda61 100644 --- a/graalpython/graalpy-archetype-polyglot-app/src/main/resources/archetype-resources/pom.xml +++ b/graalpython/graalpy-archetype-polyglot-app/src/main/resources/archetype-resources/pom.xml @@ -10,7 +10,7 @@ #set( $symbol_dollar = '$' ) - 24.0.1 + 24.0.2 python-community 17 17 diff --git a/graalpython/graalpy-jbang/examples/hello.java b/graalpython/graalpy-jbang/examples/hello.java index 9f3c577f61..c1c8c70c16 100644 --- a/graalpython/graalpy-jbang/examples/hello.java +++ b/graalpython/graalpy-jbang/examples/hello.java @@ -40,10 +40,10 @@ */ ///usr/bin/env jbang "$0" "$@" ; exit $? -//DEPS org.graalvm.python:python-language:24.0.1 -//DEPS org.graalvm.python:python-resources:24.0.1 -//DEPS org.graalvm.python:python-launcher:24.0.1 -//DEPS org.graalvm.python:python-embedding:24.0.1 +//DEPS org.graalvm.python:python-language:24.0.2 +//DEPS org.graalvm.python:python-resources:24.0.2 +//DEPS org.graalvm.python:python-launcher:24.0.2 +//DEPS org.graalvm.python:python-embedding:24.0.2 //PIP termcolor import org.graalvm.polyglot.Context; diff --git a/graalpython/graalpy-jbang/templates/graalpy-template.java.qute b/graalpython/graalpy-jbang/templates/graalpy-template.java.qute index 337611a185..b85d7face8 100644 --- a/graalpython/graalpy-jbang/templates/graalpy-template.java.qute +++ b/graalpython/graalpy-jbang/templates/graalpy-template.java.qute @@ -4,10 +4,10 @@ {/for} {#if dependencies.isEmpty()}// //DEPS {/if} -//DEPS org.graalvm.python:python-language:24.0.1 -//DEPS org.graalvm.python:python-resources:24.0.1 -//DEPS org.graalvm.python:python-launcher:24.0.1 -//DEPS org.graalvm.python:python-embedding:24.0.1 +//DEPS org.graalvm.python:python-language:24.0.2 +//DEPS org.graalvm.python:python-resources:24.0.2 +//DEPS org.graalvm.python:python-launcher:24.0.2 +//DEPS org.graalvm.python:python-embedding:24.0.2 //PIP termcolor import org.graalvm.polyglot.Context; diff --git a/graalpython/graalpy-jbang/templates/graalpy-template_local_repo.java.qute b/graalpython/graalpy-jbang/templates/graalpy-template_local_repo.java.qute index fd05ccdd08..f0e9d53ce7 100644 --- a/graalpython/graalpy-jbang/templates/graalpy-template_local_repo.java.qute +++ b/graalpython/graalpy-jbang/templates/graalpy-template_local_repo.java.qute @@ -6,10 +6,10 @@ //REPOS mc=https://repo1.maven.org/maven2/ //REPOS local=file://{path_to_local_repo} -//DEPS org.graalvm.python:python-language:24.0.1 -//DEPS org.graalvm.python:python-resources:24.0.1 -//DEPS org.graalvm.python:python-launcher:24.0.1 -//DEPS org.graalvm.python:python-embedding:24.0.1 +//DEPS org.graalvm.python:python-language:24.0.2 +//DEPS org.graalvm.python:python-resources:24.0.2 +//DEPS org.graalvm.python:python-launcher:24.0.2 +//DEPS org.graalvm.python:python-embedding:24.0.2 //PIP termcolor import org.graalvm.polyglot.Context; diff --git a/graalpython/graalpy-maven-plugin/pom.xml b/graalpython/graalpy-maven-plugin/pom.xml index b644e5c019..4bc289175f 100644 --- a/graalpython/graalpy-maven-plugin/pom.xml +++ b/graalpython/graalpy-maven-plugin/pom.xml @@ -47,14 +47,14 @@ SOFTWARE. org.graalvm.python graalpy-maven-plugin maven-plugin - 24.0.1 + 24.0.2 graalpy-maven-plugin 17 17 UTF-8 - 24.0.1 + 24.0.2 diff --git a/mx.graalpython/mx_graalpython.py b/mx.graalpython/mx_graalpython.py index 8778d3d6e3..d6b8d5fd85 100644 --- a/mx.graalpython/mx_graalpython.py +++ b/mx.graalpython/mx_graalpython.py @@ -2076,6 +2076,12 @@ def _python_checkpatchfiles(): 'safetensors-0.3.3.patch', 'tensorflow-io-0.34.0.patch', 'tensorflow-io-gcs-filesystem-0.34.0.patch', + # Whole license in the field. It's BSD-3-Clause + 'pyzmq.patch', + # Whole license in the field. It's PSF + 'matplotlib-3.5.3.patch', + 'matplotlib-3.6.3.patch', + 'matplotlib-3.7.0.patch', } allowed_licenses = [ "MIT", diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py index 6bebdb12e6..a226ee1706 100644 --- a/mx.graalpython/suite.py +++ b/mx.graalpython/suite.py @@ -16,9 +16,9 @@ "url": "http://www.graalvm.org/", "developer": { - "name": "Truffle and Graal developers", - "email": "graalvm-users@oss.oracle.com", - "organization": "Graal", + "name": "GraalVM Development", + "email": "graalvm-dev@oss.oracle.com", + "organization": "Oracle Corporation", "organizationUrl": "http://www.graalvm.org/", }, @@ -45,7 +45,7 @@ }, { "name": "sdk", - "version": "bf0bb9bbfe346fe1b0868a56790e4d3fb9f0392e", + "version": "5616789e91e18e90bbe42285102856823ff8e7c9", "subdir": True, "urls": [ {"url": "https://github.com/oracle/graal", "kind": "git"}, @@ -53,7 +53,7 @@ }, { "name": "tools", - "version": "bf0bb9bbfe346fe1b0868a56790e4d3fb9f0392e", + "version": "5616789e91e18e90bbe42285102856823ff8e7c9", "subdir": True, "urls": [ {"url": "https://github.com/oracle/graal", "kind": "git"}, @@ -61,7 +61,7 @@ }, { "name": "sulong", - "version": "bf0bb9bbfe346fe1b0868a56790e4d3fb9f0392e", + "version": "5616789e91e18e90bbe42285102856823ff8e7c9", "subdir": True, "urls": [ {"url": "https://github.com/oracle/graal", "kind": "git"}, @@ -69,7 +69,7 @@ }, { "name": "regex", - "version": "bf0bb9bbfe346fe1b0868a56790e4d3fb9f0392e", + "version": "5616789e91e18e90bbe42285102856823ff8e7c9", "subdir": True, "urls": [ {"url": "https://github.com/oracle/graal", "kind": "git"},