Chore/java 21 (#175)

* chore: java 21 Signed-off-by: jaivalis <[email protected]> * chore: java 21 Signed-off-by: jaivalis <[email protected]> * chore: get the build to run on mrs as well Signed-off-by: jaivalis <[email protected]> * ci: reverted to akhileshns/[email protected] Signed-off-by: jaivalis <[email protected]> --------- Signed-off-by: jaivalis <[email protected]>
jaivalis · Oct 16, 2024 · e8ba0ba · e8ba0ba
1 parent 9902956
commit e8ba0ba
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/.github/workflows/build-branches.yml b/.github/workflows/build-branches.yml
@@ -8,7 +8,7 @@ on:
     types: [opened, synchronize, reopened]
 
 env:
-  JAVA_VERSION: 17
+  JAVA_VERSION: 21
   JDK_DISTRIBUTION: "temurin"
   GITHUB_SHA: ${{ github.sha }}
 

diff --git a/.github/workflows/build-tag.yml b/.github/workflows/build-tag.yml
@@ -6,7 +6,7 @@ on:
       - "*"
 
 env:
-  JAVA_VERSION: 17
+  JAVA_VERSION: 21
   JDK_DISTRIBUTION: "temurin"
   GITHUB_SHA: ${{ github.sha }}
 

diff --git a/.github/workflows/native.yml b/.github/workflows/native.yml
@@ -6,7 +6,7 @@ on:
       - "*"
 
 env:
-  JAVA_VERSION: 17
+  JAVA_VERSION: 21
   GITHUB_SHA: ${{ github.sha }}
 
 jobs:
@@ -29,14 +29,14 @@ jobs:
       - name: Set up GraalVM
         uses: graalvm/setup-graalvm@v1
         with:
-          version: "latest"
           java-version: ${{ env.JAVA_VERSION }}
+          distribution: 'graalvm'
 
       - name: Build & release native image
         if: ${{ github.actor != 'dependabot[bot]' && github.ref != 'refs/heads/jdevelop' }}
         run: |
-          echo "GRAALVM_HOME: $GRAALVM_HOME"
-          echo "JAVA_HOME: $JAVA_HOME"
+          echo "GRAALVM_HOME: ${{ GRAALVM_HOME }}"
+          echo "JAVA_HOME: ${{ JAVA_HOME }}"
           java --version
           gu --version
 
@@ -45,11 +45,11 @@ jobs:
           REPOSITORY="jaivalis/release-raccoon"
           IMAGE=${REGISTRY}/${REPOSITORY}:${TAG}
           
-          echo "Building and pushing ${IMAGE} to dockerhub"
+          echo "Building and pushing ${{ IMAGE }} to dockerhub"
 
           mvn package -DskipTests -Dquarkus.native.container-build=true \
             -Dquarkus.container-image.push=true \
-            -Dquarkus.container-image.image=${IMAGE} '-Dquarkus.jib.labels."org.opencontainers.image.revision"=${{ env.GITHUB_SHA }}'
+            -Dquarkus.container-image.image=${{ IMAGE }} '-Dquarkus.jib.labels."org.opencontainers.image.revision"=${{ env.GITHUB_SHA }}'
 
   publish:
     name: Deploy
@@ -76,7 +76,7 @@ jobs:
           java-version: ${{ env.JAVA_VERSION }}
 
       - name: Login to heroku
-        uses: akhileshns/heroku-deploy@v4
+        uses: akhileshns/heroku-deploy@v3.13.15
         with:
           heroku_email: ${{ secrets.HEROKU_EMAIL }}
           heroku_api_key: ${{ secrets.HEROKU_API_KEY }}

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -15,8 +15,8 @@
     <packaging>pom</packaging>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <maven.compiler.parameters>true</maven.compiler.parameters>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

diff --git a/pom.xml b/pom.xml
@@ -17,8 +17,8 @@
     </scm>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

diff --git a/release-raccoon-app/src/main/resources/application.properties b/release-raccoon-app/src/main/resources/application.properties
@@ -19,10 +19,8 @@ quarkus.native.additional-build-args=\
   --report-unsupported-elements-at-runtime,\
   --initialize-at-run-time=org.apache.hc.client5.http.impl.auth.NTLMEngineImpl\\,com.wrapper.spotify.SpotifyApi\\,com.wrapper.spotify.requests.AbstractRequest\\,\
   -H:IncludeResources='${PWD}/release-raccoon-app/src/main/resources/META-INF/resources/.*'
-quarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:22.3-java17
 quarkus.native.container-runtime=docker
 quarkus.native.resources.includes=**/*.sql,**/*.json,**/*.svg,**/*.ico,**/*.sql,**/*.html
-quarkus.jib.base-jvm-image=openjdk:17-jdk-alpine
 
 quarkus.http.cors=true
 

diff --git a/system.properties b/system.properties
@@ -1,2 +1,2 @@
 # used by heroku
-java.runtime.version=17
+java.runtime.version=21