From 7450cf1d5e2e3489b16e8cdceecaea88c4bbb640 Mon Sep 17 00:00:00 2001 From: Olya Gupalo Date: Mon, 16 Dec 2024 17:09:32 +0200 Subject: [PATCH 1/3] Review and move espresso-shell demo to archive; Don't run CI job monthly --- ...jshell.yml => archive-espresso-jshell.yml} | 20 ++++++++---------- README.md | 17 --------------- .../espresso-jshell}/LICENSE | 0 .../espresso-jshell}/README.md | 15 ++++++------- .../espresso-jshell}/build-espresso-jshell.sh | 0 .../espresso-jshell}/diagram.svg | 0 .../jdk/editpad/EditPadProvider.java | 0 .../espresso-jshell}/jshell8.sh | 0 .../execution/DefaultLoaderDelegate.java | 0 .../jshell/execution/DemultiplexInput.java | 0 .../execution/DirectExecutionControl.java | 0 .../execution/ExecutionControlForwarder.java | 0 .../FailOverExecutionControlProvider.java | 0 .../execution/JdiDefaultExecutionControl.java | 0 .../jdk/jshell/execution/JdiEventHandler.java | 0 .../jshell/execution/JdiExecutionControl.java | 0 .../JdiExecutionControlProvider.java | 0 .../jdk/jshell/execution/JdiInitiator.java | 0 .../jdk/jshell/execution/LoaderDelegate.java | 0 .../execution/LocalExecutionControl.java | 0 .../LocalExecutionControlProvider.java | 0 .../execution/MultiplexingOutputStream.java | 0 .../jdk/jshell/execution/PipeInputStream.java | 0 .../jdk/jshell/execution/RemoteCodes.java | 0 .../execution/RemoteExecutionControl.java | 0 .../execution/StreamingExecutionControl.java | 0 .../jshell8/jdk/jshell/execution/Util.java | 0 .../jdk/jshell/execution/package-info.java | 0 .../jdk/jshell/spi/ExecutionControl.java | 0 .../jshell/spi/ExecutionControlProvider.java | 0 .../jshell8/jdk/jshell/spi/ExecutionEnv.java | 0 .../jshell/spi/SPIResolutionException.java | 0 .../espresso-jshell}/reflect-config.json | 0 .../espresso-jshell}/resource-config.json | 0 .../jshell/EspressoExecutionControl.java | 0 .../jshell/EspressoLocalExecutionControl.java | 0 ...EspressoLocalExecutionControlProvider.java | 0 .../espresso/jshell/JavaShellLauncher.java | 0 .../oracle/truffle/espresso/jshell/Lazy.java | 0 .../jdk.jshell.spi.ExecutionControlProvider | 0 .../jdk/jshell/TaskFactory.class | Bin 18320 -> 0 bytes 41 files changed, 16 insertions(+), 36 deletions(-) rename .github/workflows/{espresso-jshell.yml => archive-espresso-jshell.yml} (56%) rename {espresso-jshell => archive/espresso-jshell}/LICENSE (100%) rename {espresso-jshell => archive/espresso-jshell}/README.md (89%) rename {espresso-jshell => archive/espresso-jshell}/build-espresso-jshell.sh (100%) rename {espresso-jshell => archive/espresso-jshell}/diagram.svg (100%) rename {espresso-jshell => archive/espresso-jshell}/jdk.editpad-patch/jdk/editpad/EditPadProvider.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8.sh (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/DefaultLoaderDelegate.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/DemultiplexInput.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/DirectExecutionControl.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/ExecutionControlForwarder.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/FailOverExecutionControlProvider.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/JdiDefaultExecutionControl.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/JdiEventHandler.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/JdiExecutionControl.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/JdiExecutionControlProvider.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/JdiInitiator.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/LoaderDelegate.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/LocalExecutionControl.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/LocalExecutionControlProvider.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/MultiplexingOutputStream.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/PipeInputStream.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/RemoteCodes.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/RemoteExecutionControl.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/StreamingExecutionControl.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/Util.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/execution/package-info.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/spi/ExecutionControl.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/spi/ExecutionControlProvider.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/spi/ExecutionEnv.java (100%) rename {espresso-jshell => archive/espresso-jshell}/jshell8/jdk/jshell/spi/SPIResolutionException.java (100%) rename {espresso-jshell => archive/espresso-jshell}/reflect-config.json (100%) rename {espresso-jshell => archive/espresso-jshell}/resource-config.json (100%) rename {espresso-jshell => archive/espresso-jshell}/src/main/java/com/oracle/truffle/espresso/jshell/EspressoExecutionControl.java (100%) rename {espresso-jshell => archive/espresso-jshell}/src/main/java/com/oracle/truffle/espresso/jshell/EspressoLocalExecutionControl.java (100%) rename {espresso-jshell => archive/espresso-jshell}/src/main/java/com/oracle/truffle/espresso/jshell/EspressoLocalExecutionControlProvider.java (100%) rename {espresso-jshell => archive/espresso-jshell}/src/main/java/com/oracle/truffle/espresso/jshell/JavaShellLauncher.java (100%) rename {espresso-jshell => archive/espresso-jshell}/src/main/java/com/oracle/truffle/espresso/jshell/Lazy.java (100%) rename {espresso-jshell => archive/espresso-jshell}/src/main/resources/META-INF/services/jdk.jshell.spi.ExecutionControlProvider (100%) delete mode 100644 espresso-jshell/jdk.jshell-patch/jdk/jshell/TaskFactory.class diff --git a/.github/workflows/espresso-jshell.yml b/.github/workflows/archive-espresso-jshell.yml similarity index 56% rename from .github/workflows/espresso-jshell.yml rename to .github/workflows/archive-espresso-jshell.yml index 05ade954d..a6409c0bb 100644 --- a/.github/workflows/espresso-jshell.yml +++ b/.github/workflows/archive-espresso-jshell.yml @@ -1,33 +1,31 @@ -name: espresso-jshell +name: archive/espresso-jshell on: push: paths: - - 'espresso-jshell/**' - - '.github/workflows/espresso-jshell.yml' + - 'archive/espresso-jshell/**' + - '.github/workflows/archive-espresso-jshell.yml' pull_request: paths: - - 'espresso-jshell/**' - - '.github/workflows/espresso-jshell.yml' - schedule: - - cron: "0 0 1 * *" # run every month + - 'archive/espresso-jshell/**' + - '.github/workflows/archive-espresso-jshell.yml' workflow_dispatch: permissions: contents: read jobs: run: - name: Run 'espresso-jshell' + name: Run 'archive/espresso-jshell' runs-on: ubuntu-latest timeout-minutes: 20 steps: - uses: actions/checkout@v4 - uses: graalvm/setup-graalvm@v1 with: - java-version: '17' + java-version: '17.0.12' distribution: 'graalvm' components: 'espresso' github-token: ${{ secrets.GITHUB_TOKEN }} - - name: Run 'espresso-jshell' + - name: Run 'archive/espresso-jshell run: | - cd espresso-jshell + cd archive/espresso-jshell ./build-espresso-jshell.sh echo "Math.PI" | ./espresso-jshell diff --git a/README.md b/README.md index 73157cf45..650fad0e5 100644 --- a/README.md +++ b/README.md @@ -127,23 +127,6 @@ cd graalvm-demos -### Java on Truffle (Espresso) - - - - - - - - - - - - - - -
NameDescription
espresso-jshell
espresso-jshell		Demonstrates how to build a native executable of JShell, that executes the dynamically generated bytecode on Espresso
Technologies: Java on Truffle, Native Image, JShell
Reference: Mixing AOT and JIT for Java, Java on Truffle — Going Fully Metacircular
- ### Micronaut diff --git a/espresso-jshell/LICENSE b/archive/espresso-jshell/LICENSE similarity index 100% rename from espresso-jshell/LICENSE rename to archive/espresso-jshell/LICENSE diff --git a/espresso-jshell/README.md b/archive/espresso-jshell/README.md similarity index 89% rename from espresso-jshell/README.md rename to archive/espresso-jshell/README.md index 032ea9809..8a369a5be 100644 --- a/espresso-jshell/README.md +++ b/archive/espresso-jshell/README.md @@ -1,7 +1,7 @@ # Native JShell and Espresso: Mixing AOT and JIT for Java -This demo showcases the integration between [GraalVM Native Image](https://www.graalvm.org/reference-manual/native-image/) and [Java-on-Truffle (Espresso)](https://www.graalvm.org/reference-manual/java-on-truffle/). -It builds a native executable version of `jshell`, that executes the dynamically generated bytecodes on Espresso. This hybrid mode achieves instant startup, beating the vanilla `jshell` in both: time to the first interaction and time to evaluate a simple expression. +This demo showcases the integration between [GraalVM Native Image](https://www.graalvm.org/reference-manual/native-image/) and [Espresso (Java on Truffle)](https://www.graalvm.org/latest/reference-manual/espresso/). +It builds a native executable version of `jshell`, that executes the dynamically generated bytecode on Espresso. This hybrid mode achieves instant startup, beating the vanilla `jshell` in both: time to the first interaction and time to evaluate a simple expression. JShell is a Java read-eval-print loop tool first introduced in Java 9, this demo also allows running `jshell` on Java 8. For further discussions and questions please join our `#espresso` channel on the [GraalVM Slack Community](https://graalvm.slack.com/). @@ -9,12 +9,11 @@ For further discussions and questions please join our `#espresso` channel on the ## Prerequisites - GraalVM for Java 11, 17 or higher -- Native Image support -- Java-on-Truffle (Espresso) support +- Espresso (Java on Truffle) support ## Preparation -1. Download and install the latest GraalVM JDK with Native Image and Java on Truffle (Espresso) components using the [GraalVM JDK Downloader](https://github.com/graalvm/graalvm-jdk-downloader). +1. Download and install the GraalVM JDK with Native Image and Espresso support using the [GraalVM JDK Downloader](https://github.com/graalvm/graalvm-jdk-downloader). ```bash bash <(curl -sL https://get.graalvm.org/jdk) -c 'espresso' ``` @@ -25,10 +24,10 @@ For further discussions and questions please join our `#espresso` channel on the git clone https://github.com/graalvm/graalvm-demos ``` ```bash - cd graalvm-demos/espresso-jshell + cd graalvm-demos/archive/espresso-jshell ``` -## How to Build +## Building Native `jshell` 1. Execute the `build-espresso-jshell.sh` script: ```bash @@ -97,4 +96,4 @@ Since the Java compiler is part of the host code compiled by `native-image`, dyn ### Learn more -Learn more about Java on Truffle on the [GraalVM website](https://www.graalvm.org/latest/reference-manual/java-on-truffle/). +Learn more about mixing JIT and native modes in the [official Espresso documentation](https://www.graalvm.org/latest/reference-manual/espresso/demos/#mixing-aot-and-jit-for-java). \ No newline at end of file diff --git a/espresso-jshell/build-espresso-jshell.sh b/archive/espresso-jshell/build-espresso-jshell.sh similarity index 100% rename from espresso-jshell/build-espresso-jshell.sh rename to archive/espresso-jshell/build-espresso-jshell.sh diff --git a/espresso-jshell/diagram.svg b/archive/espresso-jshell/diagram.svg similarity index 100% rename from espresso-jshell/diagram.svg rename to archive/espresso-jshell/diagram.svg diff --git a/espresso-jshell/jdk.editpad-patch/jdk/editpad/EditPadProvider.java b/archive/espresso-jshell/jdk.editpad-patch/jdk/editpad/EditPadProvider.java similarity index 100% rename from espresso-jshell/jdk.editpad-patch/jdk/editpad/EditPadProvider.java rename to archive/espresso-jshell/jdk.editpad-patch/jdk/editpad/EditPadProvider.java diff --git a/espresso-jshell/jshell8.sh b/archive/espresso-jshell/jshell8.sh similarity index 100% rename from espresso-jshell/jshell8.sh rename to archive/espresso-jshell/jshell8.sh diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/DefaultLoaderDelegate.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/DefaultLoaderDelegate.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/DefaultLoaderDelegate.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/DefaultLoaderDelegate.java diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/DemultiplexInput.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/DemultiplexInput.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/DemultiplexInput.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/DemultiplexInput.java diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/DirectExecutionControl.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/DirectExecutionControl.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/DirectExecutionControl.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/DirectExecutionControl.java diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/ExecutionControlForwarder.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/ExecutionControlForwarder.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/ExecutionControlForwarder.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/ExecutionControlForwarder.java diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/FailOverExecutionControlProvider.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/FailOverExecutionControlProvider.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/FailOverExecutionControlProvider.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/FailOverExecutionControlProvider.java diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/JdiDefaultExecutionControl.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/JdiDefaultExecutionControl.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/JdiDefaultExecutionControl.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/JdiDefaultExecutionControl.java diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/JdiEventHandler.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/JdiEventHandler.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/JdiEventHandler.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/JdiEventHandler.java diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/JdiExecutionControl.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/JdiExecutionControl.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/JdiExecutionControl.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/JdiExecutionControl.java diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/JdiExecutionControlProvider.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/JdiExecutionControlProvider.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/JdiExecutionControlProvider.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/JdiExecutionControlProvider.java diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/JdiInitiator.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/JdiInitiator.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/JdiInitiator.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/JdiInitiator.java diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/LoaderDelegate.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/LoaderDelegate.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/LoaderDelegate.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/LoaderDelegate.java diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/LocalExecutionControl.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/LocalExecutionControl.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/LocalExecutionControl.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/LocalExecutionControl.java diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/LocalExecutionControlProvider.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/LocalExecutionControlProvider.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/LocalExecutionControlProvider.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/LocalExecutionControlProvider.java diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/MultiplexingOutputStream.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/MultiplexingOutputStream.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/MultiplexingOutputStream.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/MultiplexingOutputStream.java diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/PipeInputStream.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/PipeInputStream.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/PipeInputStream.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/PipeInputStream.java diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/RemoteCodes.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/RemoteCodes.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/RemoteCodes.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/RemoteCodes.java diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/RemoteExecutionControl.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/RemoteExecutionControl.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/RemoteExecutionControl.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/RemoteExecutionControl.java diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/StreamingExecutionControl.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/StreamingExecutionControl.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/StreamingExecutionControl.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/StreamingExecutionControl.java diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/Util.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/Util.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/Util.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/Util.java diff --git a/espresso-jshell/jshell8/jdk/jshell/execution/package-info.java b/archive/espresso-jshell/jshell8/jdk/jshell/execution/package-info.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/execution/package-info.java rename to archive/espresso-jshell/jshell8/jdk/jshell/execution/package-info.java diff --git a/espresso-jshell/jshell8/jdk/jshell/spi/ExecutionControl.java b/archive/espresso-jshell/jshell8/jdk/jshell/spi/ExecutionControl.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/spi/ExecutionControl.java rename to archive/espresso-jshell/jshell8/jdk/jshell/spi/ExecutionControl.java diff --git a/espresso-jshell/jshell8/jdk/jshell/spi/ExecutionControlProvider.java b/archive/espresso-jshell/jshell8/jdk/jshell/spi/ExecutionControlProvider.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/spi/ExecutionControlProvider.java rename to archive/espresso-jshell/jshell8/jdk/jshell/spi/ExecutionControlProvider.java diff --git a/espresso-jshell/jshell8/jdk/jshell/spi/ExecutionEnv.java b/archive/espresso-jshell/jshell8/jdk/jshell/spi/ExecutionEnv.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/spi/ExecutionEnv.java rename to archive/espresso-jshell/jshell8/jdk/jshell/spi/ExecutionEnv.java diff --git a/espresso-jshell/jshell8/jdk/jshell/spi/SPIResolutionException.java b/archive/espresso-jshell/jshell8/jdk/jshell/spi/SPIResolutionException.java similarity index 100% rename from espresso-jshell/jshell8/jdk/jshell/spi/SPIResolutionException.java rename to archive/espresso-jshell/jshell8/jdk/jshell/spi/SPIResolutionException.java diff --git a/espresso-jshell/reflect-config.json b/archive/espresso-jshell/reflect-config.json similarity index 100% rename from espresso-jshell/reflect-config.json rename to archive/espresso-jshell/reflect-config.json diff --git a/espresso-jshell/resource-config.json b/archive/espresso-jshell/resource-config.json similarity index 100% rename from espresso-jshell/resource-config.json rename to archive/espresso-jshell/resource-config.json diff --git a/espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/EspressoExecutionControl.java b/archive/espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/EspressoExecutionControl.java similarity index 100% rename from espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/EspressoExecutionControl.java rename to archive/espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/EspressoExecutionControl.java diff --git a/espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/EspressoLocalExecutionControl.java b/archive/espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/EspressoLocalExecutionControl.java similarity index 100% rename from espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/EspressoLocalExecutionControl.java rename to archive/espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/EspressoLocalExecutionControl.java diff --git a/espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/EspressoLocalExecutionControlProvider.java b/archive/espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/EspressoLocalExecutionControlProvider.java similarity index 100% rename from espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/EspressoLocalExecutionControlProvider.java rename to archive/espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/EspressoLocalExecutionControlProvider.java diff --git a/espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/JavaShellLauncher.java b/archive/espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/JavaShellLauncher.java similarity index 100% rename from espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/JavaShellLauncher.java rename to archive/espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/JavaShellLauncher.java diff --git a/espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/Lazy.java b/archive/espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/Lazy.java similarity index 100% rename from espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/Lazy.java rename to archive/espresso-jshell/src/main/java/com/oracle/truffle/espresso/jshell/Lazy.java diff --git a/espresso-jshell/src/main/resources/META-INF/services/jdk.jshell.spi.ExecutionControlProvider b/archive/espresso-jshell/src/main/resources/META-INF/services/jdk.jshell.spi.ExecutionControlProvider similarity index 100% rename from espresso-jshell/src/main/resources/META-INF/services/jdk.jshell.spi.ExecutionControlProvider rename to archive/espresso-jshell/src/main/resources/META-INF/services/jdk.jshell.spi.ExecutionControlProvider diff --git a/espresso-jshell/jdk.jshell-patch/jdk/jshell/TaskFactory.class b/espresso-jshell/jdk.jshell-patch/jdk/jshell/TaskFactory.class deleted file mode 100644 index d32303520966a5354000d080d26d2a607b06ec7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18320 zcmd5^349dQ8UMaXva{Jt4wgd~5h4bJ97F|Cl7Jiu5)1*8a0IltY?fqUv%BtYfY{a^ zR@>TBscp5@9#-vPTdNWX)T5WSYA<_QtM;(>ZSCDk|KFQqXOr0k{n^9c&zaeI?|t|6 zzBlCI=a1e;MCWRKI!_DGN}lfL838_tPcEec9Foh-0H4CMO;n!`$FXFBs74c?2ZwXQ{Z(HWA6257lR zVzonIHAEqs-{xw?%0#jn@-4FM*8V}O~jDaF&9 zAkYZA2AW)ac0M!@V@YY#%wYf&or*bvqen08HDWyRU5*IaKEgY-La={Z{wcK zKr|k2+z=g1ria(ÍllMQFV{8abE_1!Wbqoom%Mk<^gU6Q;L! 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 OrvxWCWj$TNsec1 Date: Tue, 17 Dec 2024 13:09:38 +0200 Subject: [PATCH 2/3] Add missing TaskFactory class --- .../espresso-jshell/jdk.jshell-patch/jdk/jshell/TaskFactory.class | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 archive/espresso-jshell/jdk.jshell-patch/jdk/jshell/TaskFactory.class diff --git a/archive/espresso-jshell/jdk.jshell-patch/jdk/jshell/TaskFactory.class b/archive/espresso-jshell/jdk.jshell-patch/jdk/jshell/TaskFactory.class new file mode 100644 index 000000000..e69de29bb From 7e499973d49603fc4fd7afd1aaefcbe2948c1e92 Mon Sep 17 00:00:00 2001 From: Olga Gupalo Date: Tue, 17 Dec 2024 13:33:59 +0200 Subject: [PATCH 3/3] Update .github/workflows/archive-espresso-jshell.yml --- .github/workflows/archive-espresso-jshell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/archive-espresso-jshell.yml b/.github/workflows/archive-espresso-jshell.yml index a6409c0bb..f691c5cd7 100644 --- a/.github/workflows/archive-espresso-jshell.yml +++ b/.github/workflows/archive-espresso-jshell.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v4 - uses: graalvm/setup-graalvm@v1 with: - java-version: '17.0.12' + java-version: '17' distribution: 'graalvm' components: 'espresso' github-token: ${{ secrets.GITHUB_TOKEN }}