Merge pull request #1086 from jesperancinha/updates

Updates to JDK 21
jesperancinha · Aug 31, 2024 · 5531351 · 5531351
2 parents 925418d + 84267b5
commit 5531351
Show file tree

Hide file tree

Showing 16 changed files with 65 additions and 32 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: cimg/openjdk:17.0.1
+      - image: eclipse-temurin:21-alpine
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - checkout
-
+      - run: apk add make maven
       - run: mvn clean install
 
       - save_cache:

diff --git a/.github/workflows/concert-demos-root-cypress-update.yml b/.github/workflows/concert-demos-root-cypress-update.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set up Node.js
+      - name: Set up Node.js 20
         uses: actions/setup-node@v4
         with:
           node-version: '20'
@@ -22,7 +22,7 @@ jobs:
         run: make deps-cypress-update
 
       - name: Create pull request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7-rc
         with:
           commit-message: Update cypress dependencies
           branch: update-cypress-dependencies-and-containers

diff --git a/.github/workflows/concert-demos-root-e2e.yml b/.github/workflows/concert-demos-root-e2e.yml
@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
 
       - name: Start Docker
@@ -33,10 +33,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
 
       - name: Start Docker
@@ -55,10 +55,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
 
       - name: Start Docker
@@ -77,10 +77,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
 
       - name: Start Docker

diff --git a/.github/workflows/concert-demos-root-java-update.yml b/.github/workflows/concert-demos-root-java-update.yml
@@ -0,0 +1,28 @@
+name: Updates java
+
+on:
+  schedule:
+    - cron: '0 0 * * 0'
+  workflow_dispatch:
+
+jobs:
+  update-java:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Run dependency update script
+        run: make deps-java-update
+
+      - name: Create pull request
+        uses: peter-evans/create-pull-request@v7-rc
+        with:
+          commit-message: Update java
+          branch: update-java
+          title: 'Update java'
+          body: |
+            This pull request updates the JDK:
+            - Current plugin updates
+          labels: JDK
diff --git a/.github/workflows/concert-demos-root-merge.yml b/.github/workflows/concert-demos-root-merge.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.1.1
+        uses: dependabot/fetch-metadata@v2
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Enable auto-merge for Dependabot PRs

diff --git a/.github/workflows/concert-demos-root-plugins-update.yml b/.github/workflows/concert-demos-root-plugins-update.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set up Node.js
+      - name: Set up Node.js 20
         uses: actions/setup-node@v4
         with:
           node-version: '20'

diff --git a/.github/workflows/concert-demos-root-pull-request.yml b/.github/workflows/concert-demos-root-pull-request.yml
@@ -16,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'adopt'
 
     - name: Build and Test

diff --git a/.github/workflows/concert-demos-root-update.yml b/.github/workflows/concert-demos-root-update.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set up Node.js
+      - name: Set up Node.js 20
         uses: actions/setup-node@v4
         with:
           node-version: '20'

diff --git a/.github/workflows/concert-demos-root.yml b/.github/workflows/concert-demos-root.yml
@@ -14,10 +14,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'adopt'
 
     - name: Build and Test

diff --git a/Makefile b/Makefile
@@ -84,5 +84,14 @@ revert-deps-cypress-update:
 	git checkout e2e/package.json
 accept-prs:
 	curl -sL https://raw.githubusercontent.com/jesperancinha/project-signer/master/acceptPR.sh | bash
+deps-cypress-update:
+	curl -sL https://raw.githubusercontent.com/jesperancinha/project-signer/master/cypressUpdateOne.sh | bash
+deps-plugins-update:
+	curl -sL https://raw.githubusercontent.com/jesperancinha/project-signer/master/pluginUpdatesOne.sh | bash
+deps-java-update:
+	curl -sL https://raw.githubusercontent.com/jesperancinha/project-signer/master/javaUpdatesOne.sh | bash
+deps-node-update:
+	curl -sL https://raw.githubusercontent.com/jesperancinha/project-signer/master/nodeUpdatesOne.sh | bash
+deps-quick-update: deps-cypress-update deps-plugins-update deps-java-update deps-node-update
 dc-migration:
 	curl -sL https://raw.githubusercontent.com/jesperancinha/project-signer/master/setupDockerCompose.sh | bash
diff --git a/concert-demos-rest-service-mvc/Dockerfile b/concert-demos-rest-service-mvc/Dockerfile
@@ -1,11 +1,9 @@
-FROM openjdk:17-slim-buster
+FROM eclipse-temurin:21-alpine
 
 ENV runningFolder /usr/local/bin/
 
 WORKDIR ${runningFolder}
 
-RUN apt-get update
-
 COPY target/concert-demos-rest-service-mvc.jar ${runningFolder}/concert-demos-rest-service-mvc.jar
 
 COPY entrypoint.sh ${runningFolder}

diff --git a/concert-demos-rest-service-mvc/entrypoint.sh b/concert-demos-rest-service-mvc/entrypoint.sh
@@ -1,2 +1,2 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 java -jar -Dspring.profiles.active=prod concert-demos-rest-service-mvc.jar
diff --git a/concert-demos-rest-service-webflux/Dockerfile b/concert-demos-rest-service-webflux/Dockerfile
@@ -1,11 +1,9 @@
-FROM openjdk:17-slim-buster
+FROM eclipse-temurin:21-alpine
 
 ENV runningFolder /usr/local/bin/
 
 WORKDIR ${runningFolder}
 
-RUN apt-get update
-
 COPY target/concert-demos-rest-service-webflux.jar ${runningFolder}/concert-demos-rest-service-webflux.jar
 
 COPY entrypoint.sh ${runningFolder}

diff --git a/concert-demos-rest-service-webflux/entrypoint.sh b/concert-demos-rest-service-webflux/entrypoint.sh
@@ -1,2 +1,2 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 java -jar -Dspring.profiles.active=prod concert-demos-rest-service-webflux.jar
diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   e2e-electron:
-    image: "cypress/included:13.13.3"
+    image: "cypress/included:13.14.1"
     working_dir: /e2e
     command: "--browser electron --env host_mvc=mvc,host_webflux=webflux"
     volumes:
@@ -10,7 +10,7 @@ services:
       - concerts
 
   e2e-chrome:
-    image: "cypress/included:13.13.3"
+    image: "cypress/included:13.14.1"
     working_dir: /e2e
     command: "--browser chrome --env host_mvc=mvc,host_webflux=webflux"
     volumes:
@@ -19,7 +19,7 @@ services:
       - concerts
 
   e2e-firefox:
-    image: "cypress/included:13.13.3"
+    image: "cypress/included:13.14.1"
     working_dir: /e2e
     command: "--browser firefox --env host_mvc=mvc,host_webflux=webflux"
     volumes:
@@ -28,7 +28,7 @@ services:
       - concerts
 
   e2e-edge:
-    image: "cypress/included:13.13.3"
+    image: "cypress/included:13.14.1"
     working_dir: /e2e
     command: "--browser edge --env host_mvc=mvc,host_webflux=webflux"
     volumes:

diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
     <properties>
         <!-- Build -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <maven-compiler-plugin.source>${java.version}</maven-compiler-plugin.source>
         <maven-compiler-plugin.target>${java.version}</maven-compiler-plugin.target>
         <maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>