Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: [PAGOPA-1455] migration to java 17 #201

Merged
merged 48 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
4e783ba
[PAGOPA-1455] migration to java 17: update from 11 to 17
pagopa-github-bot Jan 16, 2024
3664d0d
[PAGOPA-1455] migration to java 17: update from 11 to 17
pagopa-github-bot Jan 16, 2024
33618e3
Merge branch 'PAGOPA-1455-migration-to-java17' of https://github.com/…
Jan 16, 2024
0637eb7
[PAGOPA-1455] migration to java17: amazon provider
Jan 16, 2024
bc2db1e
Merge branch 'PAGOPA-1455-migration-to-java17' of https://github.com/…
Jan 16, 2024
4091fae
[PAGOPA-1455] migration to java17: changed docker file image
Jan 16, 2024
f5bf912
Merge branch 'PAGOPA-1455-migration-to-java17' of https://github.com/…
Jan 17, 2024
465b967
Merge branch 'PAGOPA-1455-migration-to-java17' of
Jan 17, 2024
9886b32
Merge branch 'PAGOPA-1455-migration-to-java17' of https://github.com/…
Jan 17, 2024
ad6036d
Merge branch 'PAGOPA-1455-migration-to-java17' of
Jan 17, 2024
a054977
Merge branch 'PAGOPA-1455-migration-to-java17' of https://github.com/…
Jan 17, 2024
73b949b
Merge branch 'PAGOPA-1455-migration-to-java17' of
Jan 17, 2024
623b6dc
Merge branch 'PAGOPA-1455-migration-to-java17' of https://github.com/…
Jan 17, 2024
2a7bff7
Merge branch 'PAGOPA-1455-migration-to-java17' of
Jan 17, 2024
35dcf6b
Merge branch 'PAGOPA-1455-migration-to-java17' of https://github.com/…
Jan 17, 2024
942b80b
Merge branch 'PAGOPA-1455-migration-to-java17' of
Jan 17, 2024
eb1088c
Merge branch 'PAGOPA-1455-migration-to-java17' of https://github.com/…
Jan 17, 2024
a1209ac
Bump to version 0.10.5-1-PAGOPA-1455-migration-to-java17 [skip ci]
pagopa-github-bot Jan 17, 2024
9e272a4
Merge branch 'PAGOPA-1455-migration-to-java17' of
Jan 17, 2024
fa7d158
Bump to version 0.10.5-2-PAGOPA-1455-migration-to-java17 [skip ci]
pagopa-github-bot Jan 17, 2024
9c087e0
Merge branch 'PAGOPA-1455-migration-to-java17' of https://github.com/…
alessio-acitelli Jan 17, 2024
25ad3e5
[PAGOPA-1455] migration to java 17: update from 11 to 17
pagopa-github-bot Jan 16, 2024
b2f2b8f
Bump to version 0.10.5-1-PAGOPA-1455-migration-to-java17 [skip ci]
pagopa-github-bot Jan 17, 2024
1136ef9
Bump to version 0.10.5-2-PAGOPA-1455-migration-to-java17 [skip ci]
pagopa-github-bot Jan 17, 2024
5ad7673
Merge branch 'PAGOPA-1455-migration-to-java17' of
Jan 17, 2024
af8557f
Bump to version 0.10.5-3-PAGOPA-1455-migration-to-java17 [skip ci]
pagopa-github-bot Jan 17, 2024
3d9c7c0
Bump to version 0.10.5-4-PAGOPA-1455-migration-to-java17 [skip ci]
pagopa-github-bot Jan 17, 2024
e65a6f2
Merge branch 'PAGOPA-1455-migration-to-java17' of
Jan 17, 2024
2194f21
Merge branch 'PAGOPA-1455-migration-to-java17' of https://github.com/…
Jan 17, 2024
1e52a21
Merge branch 'PAGOPA-1455-migration-to-java17' of
Jan 17, 2024
306a945
Merge branch 'PAGOPA-1455-migration-to-java17' of
Jan 17, 2024
83a7c71
Merge branch 'PAGOPA-1455-migration-to-java17' of https://github.com/…
Jan 17, 2024
7a24233
Merge branch 'PAGOPA-1455-migration-to-java17' of
Jan 17, 2024
1b0a297
Merge branch 'PAGOPA-1455-migration-to-java17' of https://github.com/…
Jan 17, 2024
0a9147c
Merge branch 'PAGOPA-1455-migration-to-java17' of
Jan 17, 2024
1768ded
Merge branch 'PAGOPA-1455-migration-to-java17' of https://github.com/…
Jan 17, 2024
f595913
Merge branch 'PAGOPA-1455-migration-to-java17' of
Jan 17, 2024
7c39a3d
Merge branch 'PAGOPA-1455-migration-to-java17' of https://github.com/…
Jan 17, 2024
a09d6db
Merge branch 'PAGOPA-1455-migration-to-java17' of
Jan 17, 2024
81c8817
Merge branch 'PAGOPA-1455-migration-to-java17' of https://github.com/…
Jan 17, 2024
dabb7ee
Merge branch 'PAGOPA-1455-migration-to-java17' of
Jan 17, 2024
1be7f32
Merge branch 'PAGOPA-1455-migration-to-java17' of https://github.com/…
Jan 17, 2024
5f99750
[PAGOPA-1455] migration to java17: fix open telemetry
Jan 17, 2024
4dbe871
Merge branch 'PAGOPA-1455-migration-to-java17' of https://github.com/…
Jan 17, 2024
4a15875
Bump to version 0.10.5-5-PAGOPA-1455-migration-to-java17 [skip ci]
pagopa-github-bot Jan 17, 2024
9b5e3f6
[PAGOPA-1455] migration to java17: aligned all docker files to
Jan 17, 2024
57033d7
Merge branch 'PAGOPA-1455-migration-to-java17' of https://github.com/…
Jan 25, 2024
e9ed799
Merge branch 'PAGOPA-1455-migration-to-java17' of
Jan 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/code_review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,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/*,**/util/*"
cpd_exclusions: "**/model/**,**/entity/*"
java_version: 17

smoke-test:
name: Smoke Test
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/db_migration_with_github_runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17

- name: Set up Maven
uses: stCarolas/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update_code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: Login
id: login
Expand Down
11 changes: 7 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
#
# 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

#
# Package stage
#
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/ ./
COPY --chown=spring:spring --from=builder snapshot-dependencies/ ./
Expand All @@ -23,4 +24,6 @@ RUN true
COPY --chown=spring:spring --from=builder spring-boot-loader/ ./
COPY --chown=spring:spring --from=builder application/ ./

EXPOSE 8080
EXPOSE 8080

ENTRYPOINT ["java","-javaagent:opentelemetry-javaagent.jar","--enable-preview","org.springframework.boot.loader.JarLauncher"]
4 changes: 2 additions & 2 deletions Dockerfile.deploy
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM adoptopenjdk/openjdk11:alpine-jre as builder
FROM amazoncorretto:17.0.9-alpine3.18@sha256:df48bf2e183230040890460ddb4359a10aa6c7aad24bd88899482c52053c7e17 as builder

ARG JAR_FILE=target/*.jar
COPY ${JAR_FILE} application.jar
RUN java -Djarmode=layertools -jar application.jar extract

FROM adoptopenjdk/openjdk11:alpine-jre
FROM amazoncorretto:17.0.9-alpine3.18@sha256:df48bf2e183230040890460ddb4359a10aa6c7aad24bd88899482c52053c7e17

RUN addgroup -S spring && adduser -S spring -G spring
USER spring:spring
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=linux/amd64 adoptopenjdk/openjdk11:jdk-11.0.9.1_1-alpine
FROM --platform=linux/amd64 amazoncorretto:17.0.9-alpine3.18@sha256:df48bf2e183230040890460ddb4359a10aa6c7aad24bd88899482c52053c7e17
ARG JAR_FILE=./target/gpd*.jar

EXPOSE 8080
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ or that for `yaml` version

---
## Technology Stack
- Java 11
- Java 17
- Spring Boot
- Spring Web
- Hibernate
Expand Down Expand Up @@ -58,7 +58,7 @@ bash ./docker/run_docker.sh local
### Prerequisites
- git
- maven
- jdk-11
- jdk-17
- docker

### Run the project
Expand Down
4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: pagopa-gpd-core
description: micro-service to manage Creditor Institution debtor positions
type: application
version: 0.76.0
appVersion: 0.10.5
version: 0.81.0
appVersion: 0.10.5-5-PAGOPA-1455-migration-to-java17
dependencies:
- name: microservice-chart
version: 2.4.0
Expand Down
2 changes: 1 addition & 1 deletion helm/values-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ microservice-chart:
fullnameOverride: ""
image:
repository: ghcr.io/pagopa/pagopa-debt-position
tag: "0.10.5"
tag: "0.10.5-5-PAGOPA-1455-migration-to-java17"
pullPolicy: Always
livenessProbe:
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion helm/values-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ microservice-chart:
fullnameOverride: ""
image:
repository: ghcr.io/pagopa/pagopa-debt-position
tag: "0.10.5"
tag: "0.10.5-5-PAGOPA-1455-migration-to-java17"
pullPolicy: Always
livenessProbe:
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion helm/values-uat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ microservice-chart:
fullnameOverride: ""
image:
repository: ghcr.io/pagopa/pagopa-debt-position
tag: "0.10.5"
tag: "0.10.5-5-PAGOPA-1455-migration-to-java17"
pullPolicy: Always
livenessProbe:
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion openapi/openapi_external.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"title": "PagoPA API Debt Position",
"description": "Progetto Gestione Posizioni Debitorie",
"termsOfService": "https://www.pagopa.gov.it/",
"version": "0.10.5"
"version": "0.10.5-5-PAGOPA-1455-migration-to-java17"
},
"servers": [
{
Expand Down
2 changes: 1 addition & 1 deletion openapi/openapi_external_massive.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"title": "PagoPA API Debt Position",
"description": "Progetto Gestione Posizioni Debitorie",
"termsOfService": "https://www.pagopa.gov.it/",
"version": "0.10.5"
"version": "0.10.5-5-PAGOPA-1455-migration-to-java17"
},
"servers": [
{
Expand Down
2 changes: 1 addition & 1 deletion openapi/openapi_internal.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"title": "PagoPA API Debt Position",
"description": "Progetto Gestione Posizioni Debitorie",
"termsOfService": "https://www.pagopa.gov.it/",
"version": "0.10.5"
"version": "0.10.5-5-PAGOPA-1455-migration-to-java17"
},
"servers": [
{
Expand Down
2 changes: 1 addition & 1 deletion openapi/openapi_send.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"title": "PagoPA API Debt Position",
"description": "Progetto Gestione Posizioni Debitorie",
"termsOfService": "https://www.pagopa.gov.it/",
"version": "0.10.5"
"version": "0.10.5-5-PAGOPA-1455-migration-to-java17"
},
"servers": [
{
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.2</version>
<version>2.6.15</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>it.gov.pagopa.debtposition</groupId>
<artifactId>gpd</artifactId>
<version>0.10.5</version>
<version>0.10.5-5-PAGOPA-1455-migration-to-java17</version>
<name>Gestione Posizioni Debitorie</name>
<description>Progetto Gestione Posizioni Debitorie</description>
<properties>
<java.version>11</java.version>
<java.version>17</java.version>
<springdoc-version>1.6.6</springdoc-version>
<modelmapper-version>3.1.0</modelmapper-version>
<jackson-datatype-jsr310-version>2.13.1</jackson-datatype-jsr310-version>
Expand Down

This file was deleted.

Loading