Merge pull request #34 from pagopa/PAGOPA-1470-sviluppo-afm-utils-e-a…

…fm-calculator-migrazione-java-17 PAGOPA-1470 moving to java 17
pagopa · Jan 25, 2024 · 658d901 · 658d901
2 parents 2acbf60 + 8674786
commit 658d901
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 18 deletions.
diff --git a/.github/workflows/code_review.yml b/.github/workflows/code_review.yml
@@ -35,13 +35,14 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - name: Code Review
-        uses: pagopa/github-actions-template/maven-code-review@v1.4.2
+        uses: pagopa/github-actions-template/maven-code-review@v1.10.4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           sonar_token: ${{ secrets.SONAR_TOKEN }}
           project_key: ${{env.PROJECT_KEY}}
           coverage_exclusions: "**/config/*,**/*Mock*,**/model/**,**/entity/*"
           cpd_exclusions: "**/model/**,**/entity/*"
+          java_version: 17
 
   smoke-test:
     name: Smoke Test

diff --git a/.github/workflows/update_code.yml b/.github/workflows/update_code.yml
@@ -25,10 +25,10 @@ jobs:
         run: hub pr checkout ${{ github.event.issue.number }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - name: Run Service on Docker
         shell: bash

diff --git a/Dockerfile b/Dockerfile
@@ -1,18 +1,18 @@
 #
 # Build
 #
-FROM maven:3.8.4-jdk-11-slim as buildtime
+FROM maven:3.9.5-amazoncorretto-17-al2023@sha256:eeaa7ab572d931f7273fc5cf31429923f172091ae388969e11f42ec6dd817d74 as buildtime
 WORKDIR /build
 COPY . .
 RUN mvn clean package -Dmaven.test.skip=true
 
 
-FROM adoptopenjdk/openjdk11:alpine-jre as builder
+FROM amazoncorretto:17.0.9-alpine3.18@sha256:df48bf2e183230040890460ddb4359a10aa6c7aad24bd88899482c52053c7e17 as builder
 COPY --from=buildtime /build/target/*.jar application.jar
 RUN java -Djarmode=layertools -jar application.jar extract
 
 
-FROM ghcr.io/pagopa/docker-base-springboot-openjdk11:v1.0.1@sha256:bbbe948e91efa0a3e66d8f308047ec255f64898e7f9250bdb63985efd3a95dbf
+FROM ghcr.io/pagopa/docker-base-springboot-openjdk17:v1.1.0@sha256:6fa320d452fa22066441f1ef292d15eb06f944bc8bca293e1a91ea460d30a613
 ADD --chown=spring:spring https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.25.1/opentelemetry-javaagent.jar .
 
 COPY --chown=spring:spring  --from=builder dependencies/ ./

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ See the [OpenApi 3 here.](https://editor.swagger.io/?url=https://raw.githubuserc
 ---
 
 ## Technology Stack
-- Java 11
+- Java 17
 - Spring Boot
 - Spring Web
 
@@ -31,7 +31,7 @@ See the [OpenApi 3 here.](https://editor.swagger.io/?url=https://raw.githubuserc
 ### Prerequisites
 - git
 - maven
-- jdk-11
+- jdk-17
 - docker
 
 ## Contributors 👥

diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: pagopa-afm-utils
 description: Utility microservice for pagoPA AFM
 type: application
-version: 0.19.0
-appVersion: 0.9.1
+version: 0.20.0
+appVersion: 0.9.1-1-PAGOPA-1470-sviluppo-afm-utils-e-afm-calculator-migrazione-java-17
 dependencies:
   - name: microservice-chart
     version: 2.4.0

diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-afm-utils
-    tag: "0.9.1"
+    tag: "0.9.1-1-PAGOPA-1470-sviluppo-afm-utils-e-afm-calculator-migrazione-java-17"
     pullPolicy: Always
   livenessProbe:
     httpGet:

diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-afm-utils
-    tag: "0.9.1"
+    tag: "0.9.1-1-PAGOPA-1470-sviluppo-afm-utils-e-afm-calculator-migrazione-java-17"
     pullPolicy: Always
   livenessProbe:
     httpGet:

diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-afm-utils
-    tag: "0.9.1"
+    tag: "0.9.1-1-PAGOPA-1470-sviluppo-afm-utils-e-afm-calculator-migrazione-java-17"
     pullPolicy: Always
   livenessProbe:
     httpGet:

diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -4,7 +4,7 @@
     "title": "afm-utils",
     "description": "@project.description@",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "0.9.1"
+    "version": "0.9.1-1-PAGOPA-1470-sviluppo-afm-utils-e-afm-calculator-migrazione-java-17"
   },
   "servers": [
     {

diff --git a/pom.xml b/pom.xml
@@ -13,15 +13,15 @@
 
     <groupId>it.gov.pagopa</groupId>
     <artifactId>afm-utils</artifactId>
-    <version>0.9.1</version>
+    <version>0.9.1-1-PAGOPA-1470-sviluppo-afm-utils-e-afm-calculator-migrazione-java-17</version>
     <name>afm-utils</name>
     <description>Utility microservice for pagoPA AFM</description>
     <packaging>jar</packaging>
 
     <properties>
-        <java.version>11</java.version>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <java.version>17</java.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
 
         <cosmos-data-version>3.30.0</cosmos-data-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>