From ed242157decf09dd0f42bcae246afc665328474d Mon Sep 17 00:00:00 2001
From: Olya Gupalo <olga.gupalo@oracle.com>
Date: Fri, 15 Dec 2023 17:19:21 +0100
Subject: [PATCH] Upgrade to GraalVM 22.2.0 where R language support was still
 available

---
 .github/workflows/spring-r.yml |  4 ++--
 functionGraphDemo/README.md    |  2 +-
 spring-r/README.md             | 13 ++++++++-----
 spring-r/pom.xml               |  4 ++--
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/spring-r.yml b/.github/workflows/spring-r.yml
index 5c3595b9b..0eeef2af0 100644
--- a/.github/workflows/spring-r.yml
+++ b/.github/workflows/spring-r.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: graalvm/setup-graalvm@v1
         with:
-          version: '22.1.0'
+          version: '22.2.0'
           java-version: '11'
           components: 'R'
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -30,6 +30,6 @@ jobs:
       - name: Run 'spring-r'
         run: |
           cd spring-r
-          mvn --no-transfer-progress spring-boot:run -Dgraalvm.version=22.1.0 &
+          mvn --no-transfer-progress spring-boot:run -Dgraalvm.version=22.2.0 &
           sleep 60
           curl http://localhost:8080/load
diff --git a/functionGraphDemo/README.md b/functionGraphDemo/README.md
index fe25c220e..72cec4e94 100644
--- a/functionGraphDemo/README.md
+++ b/functionGraphDemo/README.md
@@ -15,7 +15,7 @@ This is a multi-language application mixing JavaScript, Java, and R to demonstra
 
 1. Download and install GraalVM 22.3 with the Node.js, R, and Ruby languages support, using the [GraalVM JDK Downloader](https://github.com/graalvm/graalvm-jdk-downloader).
     ```bash
-    bash <(curl -sL https://get.graalvm.org/jdk) graalvm-ce-java17-22.3.0 -c 'nodejs,R,ruby'
+    bash <(curl -sL https://get.graalvm.org/jdk) graalvm-ce-java17-22.2.0 -c 'nodejs,R,ruby'
     ```
     Follow the post-install message.
 
diff --git a/spring-r/README.md b/spring-r/README.md
index 731e6c9b5..3b6a695bb 100644
--- a/spring-r/README.md
+++ b/spring-r/README.md
@@ -4,17 +4,20 @@ This repository contains the code for a demo application for [GraalVM](graalvm.o
 
 ### Prerequisites
 
-* [GraalVM](http://graalvm.org)
-* [R support](https://www.graalvm.org/latest/reference-manual/r/)
+- [GraalVM 22.2.0  or lower](https://www.graalvm.org/)
+- [R runtime](https://www.graalvm.org/22.3/reference-manual/r/)
+
+>Note: FastR is no longer under active development and is in maintenance mode. The last released version is 22.3.0.
 
 ## Preparation
 
 This is a simple Java Spring application that uses GraalVM interoperability to load an R script, which uses typical R packages, `lattice` in this case.
 
-1. Download and install the latest GraalVM JDK with R support using the [GraalVM JDK Downloader](https://github.com/graalvm/graalvm-jdk-downloader):
+1. Download and install GraalVM 22.2.0 with the R language support, using the [GraalVM JDK Downloader](https://github.com/graalvm/graalvm-jdk-downloader).
     ```bash
-    bash <(curl -sL https://get.graalvm.org/jdk) -c 'R'
+    bash <(curl -sL https://get.graalvm.org/jdk) graalvm-ce-java17-22.2.0 -c 'R'
     ```
+    Follow the post-install message.
 
 2. Download or clone the repository and navigate into the `spring-r` directory:
     ```bash
@@ -26,7 +29,7 @@ This is a simple Java Spring application that uses GraalVM interoperability to l
 
 4. Run the example:
     ```bash
-    mvn spring-boot:run -Dgraalvm.version=22.1.0
+    mvn spring-boot:run -Dgraalvm.version=22.2.0
     ```
 
 Replace "22.1.0" with your version of GraalVM.
diff --git a/spring-r/pom.xml b/spring-r/pom.xml
index 164bb61e1..a9cf5f865 100644
--- a/spring-r/pom.xml
+++ b/spring-r/pom.xml
@@ -21,8 +21,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-        <graalvm.version>21.2.0</graalvm.version>
+        <java.version>11</java.version>
+        <graalvm.version>22.2.0</graalvm.version>
     </properties>
 
     <dependencies>