Make Java 17 the default version

TEAMMATES · Mar 12, 2024 · 6b71b60 · 6b71b60
1 parent 26ce24e
commit 6b71b60
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 97 deletions.
diff --git a/.github/workflows/axe.yml b/.github/workflows/axe.yml
@@ -16,17 +16,17 @@ jobs:
       matrix:
         browser: [firefox]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '11'
+          distribution: temurin
+          java-version: 17
       - name: Cache Gradle packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches

diff --git a/.github/workflows/component.yml b/.github/workflows/component.yml
@@ -19,19 +19,19 @@ jobs:
         os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: '0'
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '11'
+          distribution: temurin
+          java-version: 17
       - name: Cache Gradle packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
@@ -40,15 +40,15 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Cache eslint
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ./.eslintcache
           key: ${{ runner.os }}-eslint-${{ hashFiles('.eslintcache') }}
           restore-keys: |
             ${{ runner.os }}-eslint-
       - name: Cache stylelint
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ./.stylelintcache
@@ -68,17 +68,17 @@ jobs:
         os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '11'
+          distribution: temurin
+          java-version: 17
       - name: Cache Gradle packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches

diff --git a/.github/workflows/dev-docs.yml b/.github/workflows/dev-docs.yml
@@ -17,14 +17,14 @@ jobs:
         shell: bash
         working-directory: docs
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
-          java-version: '11'
-          distribution: 'temurin'
+          java-version: 17
+          distribution: temurin
       - name: Install Graphviz
         run: sudo apt install graphviz
       - run: npm ci

diff --git a/.github/workflows/e2e-sql.yml b/.github/workflows/e2e-sql.yml
@@ -20,17 +20,17 @@ jobs:
         browser: [firefox]
         tests: [stable, unstable]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '11'
+          distribution: temurin
+          java-version: 17
       - name: Cache Gradle packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
@@ -53,4 +53,4 @@ jobs:
           ./gradlew serverRun &
           ./wait-for-server.sh
       - name: Start Tests
-        run: xvfb-run --server-args="-screen 0 1024x768x24" ./gradlew -P${{ matrix.tests }} e2eTestsSql
+        run: xvfb-run --server-args="-screen 0 1024x768x24" ./gradlew -P${{ matrix.tests }} e2eTestsSql
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -20,17 +20,17 @@ jobs:
         browser: [firefox]
         tests: [stable, unstable]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '11'
+          distribution: temurin
+          java-version: 17
       - name: Cache Gradle packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
@@ -54,4 +54,3 @@ jobs:
           ./wait-for-server.sh
       - name: Start Tests
         run: xvfb-run --server-args="-screen 0 1024x768x24" ./gradlew -P${{ matrix.tests }} e2eTests
-
diff --git a/.github/workflows/jdk17.yml b/.github/workflows/jdk17.yml
diff --git a/.github/workflows/lnp.yml b/.github/workflows/lnp.yml
@@ -11,14 +11,14 @@ jobs:
   LnP-testing:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '11'
+          distribution: temurin
+          java-version: 17
       - name: Cache Gradle packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches

diff --git a/docs/setting-up.md b/docs/setting-up.md
@@ -44,8 +44,8 @@ More information can be found at [this documentation](https://help.github.com/ar
 
 These tools are necessary regardless of whether you are developing front-end or back-end:
 
-1. Install Java JDK 11.
-   * Alternatively, it is possible to use JDK 17 or JDK 21, as long as newer language features are not used.
+1. Install Java JDK 17.
+   * Alternatively, it is possible to use JDK 21, as long as newer language features are not used.
 
 If you want to develop front-end, you need to install the following:
 

diff --git a/gradle.template.properties b/gradle.template.properties
@@ -4,8 +4,8 @@ org.gradle.daemon=false
 
 # Use this property if you want to use a JDK other than the one specified in your PATH variable.
 # Windows users should use a forward slash (/) instead of the Windows default backward slash (\) while specifying the path.
-# e.g org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk-11.jdk/Contents/Home
-# e.g org.gradle.java.home=C:/Program Files/Java/jdk-11
+# e.g org.gradle.java.home=/Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home
+# e.g org.gradle.java.home=C:/Program Files/Java/jdk-17
 # org.gradle.java.home=
 
 # Use this property if you want to use a specific Cloud SDK installation.

diff --git a/src/main/appengine/app.template.yaml b/src/main/appengine/app.template.yaml
@@ -2,12 +2,12 @@
 # In order to deploy to one kind of runtime, the configuration for the other kind must be completely removed/commented out.
 
 ###########################################################################
-# App Engine Standard (Java 11) configuration
-# Reference: https://cloud.google.com/appengine/docs/standard/java11/config/appref
+# App Engine Standard (Java 17) configuration
+# Reference: https://cloud.google.com/appengine/docs/standard/reference/app-yaml?tab=java
 ###########################################################################
 
-# Run/deploy with Java 11 runtime.
-runtime: java11
+# Run/deploy with Java 17 runtime.
+runtime: java17
 
 # Command to run the application as how it would be done in command line.
 entrypoint: >
@@ -30,7 +30,7 @@ instance_class: F1
 
 handlers:
   # These are the handlers for static files. By specifying them as static files, requests pointing to these URLs will not add up to instance load.
-  # Reference: https://cloud.google.com/appengine/docs/standard/java11/config/appref#handlers_element
+  # Reference: https://cloud.google.com/appengine/docs/standard/reference/app-yaml?tab=java#handlers_element
 
   # Assets and front-end files
   - url: /assets
@@ -79,7 +79,7 @@ handlers:
 
 # Defines policy for automatic scaling (instance class F*).
 # If the application uses instance class B*, this part is not relevant.
-# Reference: https://cloud.google.com/appengine/docs/standard/java11/config/appref#scaling_elements
+# Reference: https://cloud.google.com/appengine/docs/standard/reference/app-yaml?tab=java#scaling_elements
 automatic_scaling:
   # max_instances: 0
   # min_instances: 0
@@ -92,7 +92,7 @@ automatic_scaling:
   target_throughput_utilization: 0.6
 
 # Enable warmup request to reduce latency when new instances are created.
-# Reference: https://cloud.google.com/appengine/docs/standard/java11/configuring-warmup-requests
+# Reference: https://cloud.google.com/appengine/docs/standard/configuring-warmup-requests?tab=java
 inbound_services:
   - warmup
 

diff --git a/src/main/appengine/cron.yaml b/src/main/appengine/cron.yaml
@@ -1,4 +1,4 @@
-# Reference: https://cloud.google.com/appengine/docs/standard/java11/scheduling-jobs-with-cron-yaml
+# Reference: https://cloud.google.com/appengine/docs/standard/scheduling-jobs-with-cron-yaml
 
 cron:
 - url: '/auto/feedbackSessionOpeningReminders'

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11-jre
+FROM amazoncorretto:17-alpine-jdk
 
 COPY dist .
 COPY WEB-INF WEB-INF