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

…afm-calculator-migrazione-java-17 PAGOPA-1470 moving to java 17
pagopa · Jan 24, 2024 · e1e72aa · e1e72aa
2 parents 0c65c53 + 5db0447
commit e1e72aa
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 17 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
@@ -22,10 +22,10 @@ jobs:
           ref: ${{ github.ref }}
           token: ${{ secrets.BOT_TOKEN_GITHUB }}
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
 #      - name: Update OpenApi/Swagger file
 #        run: |

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
@@ -22,7 +22,7 @@ See the [OpenApi 3 here](https://editor.swagger.io/?url=https://raw.githubuserco
 ---
 
 ## Technology Stack
-- Java 11
+- Java 17
 - Spring Boot
 - Spring Web
 - Hibernate
@@ -35,7 +35,7 @@ See the [OpenApi 3 here](https://editor.swagger.io/?url=https://raw.githubuserco
 ### 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-calculator
 description: Microservice that handles calculation for pagoPA Advanced Fees Management
 type: application
-version: 2.10.2-1-main
-appVersion: 2.10.2-1-main
+version: 2.11.0
+appVersion: 2.10.2-2-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-calculator
-    tag: "2.10.2-1-main"
+    tag: "2.10.2-2-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-calculator
-    tag: "2.10.2-1-main"
+    tag: "2.10.2-2-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-calculator
-    tag: "2.10.2-1-main"
+    tag: "2.10.2-2-PAGOPA-1470-sviluppo-afm-utils-e-afm-calculator-migrazione-java-17"
     pullPolicy: Always
   livenessProbe:
     httpGet:

diff --git a/openapi/openapi-node.json b/openapi/openapi-node.json
@@ -4,7 +4,7 @@
     "title": "PagoPA API Calculator Logic for Node",
     "description": "Calculator Logic microservice for pagoPA AFM",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "2.10.2-1-main"
+    "version": "2.10.2-2-PAGOPA-1470-sviluppo-afm-utils-e-afm-calculator-migrazione-java-17"
   },
   "servers": [
     {

diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -4,7 +4,7 @@
     "title": "PagoPA API Calculator Logic",
     "description": "Calculator Logic microservice for pagoPA AFM",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "2.10.2-1-main"
+    "version": "2.10.2-2-PAGOPA-1470-sviluppo-afm-utils-e-afm-calculator-migrazione-java-17"
   },
   "servers": [
     {

diff --git a/pom.xml b/pom.xml
@@ -11,12 +11,12 @@
 
     <groupId>it.gov.pagopa</groupId>
     <artifactId>calculator</artifactId>
-    <version>2.10.2-1-main</version>
+    <version>2.10.2-2-PAGOPA-1470-sviluppo-afm-utils-e-afm-calculator-migrazione-java-17</version>
     <name>afm-calculator</name>
     <description>Calculator Logic microservice for pagoPA AFM</description>
 
     <properties>
-        <java.version>11</java.version>
+        <java.version>17</java.version>
         <hibernate-version>6.1.1.Final</hibernate-version>
         <azure.storage.table.version>8.6.6</azure.storage.table.version>
         <testcontainers.version>1.17.2</testcontainers.version>