Merge branch 'main' into feature/SELC-5615

pagopa · Nov 22, 2024 · 6cba4ff · 6cba4ff
2 parents 6f67ee5 + e6685b4
commit 6cba4ff
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 30 deletions.
diff --git a/apps/onboarding-cdc/src/main/openapi/onboarding_functions.json b/apps/onboarding-cdc/src/main/openapi/onboarding_functions.json
@@ -539,7 +539,8 @@
           "AS",
           "REC",
           "CON",
-          "PRV"
+          "PRV",
+          "GPU"
         ],
         "type": "string"
       },

diff --git a/apps/onboarding-functions/pom.xml b/apps/onboarding-functions/pom.xml
@@ -22,6 +22,7 @@
     <skipITs>true</skipITs>
     <surefire-plugin.version>3.1.2</surefire-plugin.version>
     <mapstruct.version>1.5.5.Final</mapstruct.version>
+    <commons-sdk-version>0.5.0</commons-sdk-version>
   </properties>
 
   <dependencyManagement>
@@ -190,25 +191,27 @@
         <artifactId>applicationinsights-web</artifactId>
         <version>2.6.4</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-csv</artifactId>
+      <version>1.12.0</version>
+    </dependency>
+
+    <!-- onboardings dependency -->
     <dependency>
       <groupId>it.pagopa.selfcare</groupId>
       <artifactId>onboarding-sdk-crypto</artifactId>
-      <version>0.4.1</version>
+      <version>${commons-sdk-version}</version>
     </dependency>
     <dependency>
       <groupId>it.pagopa.selfcare</groupId>
       <artifactId>onboarding-sdk-azure-storage</artifactId>
-      <version>0.4.1</version>
+      <version>${commons-sdk-version}</version>
     </dependency>
     <dependency>
       <groupId>it.pagopa.selfcare</groupId>
       <artifactId>onboarding-sdk-product</artifactId>
-      <version>0.4.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-csv</artifactId>
-      <version>1.12.0</version>
+      <version>${commons-sdk-version}</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/apps/onboarding-functions/src/main/openapi/core.json b/apps/onboarding-functions/src/main/openapi/core.json
@@ -2086,7 +2086,7 @@
           "style" : "simple",
           "schema" : {
             "type" : "string",
-            "enum" : [ "AS", "CON", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP" ]
+            "enum" : [ "AS", "CON", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP", "GPU" ]
           }
         } ],
         "responses" : {
@@ -2964,7 +2964,7 @@
           },
           "institutionType" : {
             "type" : "string",
-            "enum" : [ "AS", "CON", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP" ]
+            "enum" : [ "AS", "CON", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP", "GPU" ]
           },
           "subunitCode" : {
             "type" : "string"
@@ -3226,7 +3226,7 @@
           },
           "institutionType" : {
             "type" : "string",
-            "enum" : [ "AS", "CON", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP" ]
+            "enum" : [ "AS", "CON", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP", "GPU" ]
           },
           "onboarding" : {
             "type" : "array",
@@ -3440,7 +3440,7 @@
           },
           "institutionType" : {
             "type" : "string",
-            "enum" : [ "AS", "CON", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP" ]
+            "enum" : [ "AS", "CON", "GSP", "PA", "PG", "PRV", "PSP", "PT", "REC", "SA", "SCP", "GPU" ]
           },
           "ivassCode" : {
             "type" : "string"

diff --git a/apps/onboarding-ms/pom.xml b/apps/onboarding-ms/pom.xml
@@ -24,6 +24,7 @@
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.1.2</surefire-plugin.version>
         <quarkus-openapi-generator.version>2.4.1</quarkus-openapi-generator.version>
+        <commons-sdk-version>0.5.0</commons-sdk-version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -243,12 +244,12 @@
         <dependency>
             <groupId>it.pagopa.selfcare</groupId>
             <artifactId>onboarding-sdk-azure-storage</artifactId>
-            <version>0.4.1</version>
+            <version>${commons-sdk-version}</version>
         </dependency>
         <dependency>
             <groupId>it.pagopa.selfcare</groupId>
             <artifactId>onboarding-sdk-product</artifactId>
-            <version>0.4.1</version>
+            <version>${commons-sdk-version}</version>
         </dependency>
 
     </dependencies>

diff --git a/apps/onboarding-ms/src/main/docs/openapi.json b/apps/onboarding-ms/src/main/docs/openapi.json
@@ -2192,7 +2192,7 @@
         }
       },
       "InstitutionType" : {
-        "enum" : [ "PA", "PG", "GSP", "SA", "PT", "SCP", "PSP", "AS", "REC", "CON", "PRV" ],
+        "enum" : [ "PA", "PG", "GSP", "SA", "PT", "SCP", "PSP", "AS", "REC", "CON", "PRV", "GPU" ],
         "type" : "string"
       },
       "LocalDateTime" : {

diff --git a/apps/onboarding-ms/src/main/docs/openapi.yaml b/apps/onboarding-ms/src/main/docs/openapi.yaml
@@ -1591,6 +1591,7 @@ components:
       - REC
       - CON
       - PRV
+      - GPU
       type: string
     LocalDateTime:
       format: date-time

diff --git a/apps/onboarding-ms/src/main/openapi/core.json b/apps/onboarding-ms/src/main/openapi/core.json
@@ -1967,7 +1967,7 @@
           "style" : "simple",
           "schema" : {
             "type" : "string",
-            "enum" : [ "AS", "CON", "GSP", "PA", "PG", "PSP", "PT", "REC", "SA", "SCP", "PRV" ]
+            "enum" : [ "AS", "CON", "GSP", "PA", "PG", "PSP", "PT", "REC", "SA", "SCP", "PRV", "GPU" ]
           }
         } ],
         "responses" : {

diff --git a/apps/onboarding-ms/src/main/openapi/onboarding_functions.json b/apps/onboarding-ms/src/main/openapi/onboarding_functions.json
@@ -510,7 +510,8 @@
           "AS",
           "REC",
           "CON",
-          "PRV"
+          "PRV",
+          "GPU"
         ],
         "type": "string"
       },

diff --git a/apps/pom.xml b/apps/pom.xml
@@ -12,11 +12,15 @@
     <artifactId>onboarding-apps</artifactId>
     <packaging>pom</packaging>
 
+  <properties>
+    <commons-sdk-version>0.5.0</commons-sdk-version>
+  </properties>
+
     <dependencies>
         <dependency>
             <groupId>it.pagopa.selfcare</groupId>
             <artifactId>onboarding-sdk-common</artifactId>
-            <version>0.4.1</version>
+            <version>${commons-sdk-version}</version>
         </dependency>
     </dependencies>
 

diff --git a/libs/onboarding-sdk-azure-storage/pom.xml b/libs/onboarding-sdk-azure-storage/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>it.pagopa.selfcare</groupId>
         <artifactId>onboarding-sdk-pom</artifactId>
-        <version>0.4.1</version>
+        <version>0.5.0</version>
         <relativePath>../onboarding-sdk-pom</relativePath>
     </parent>
 

diff --git a/libs/onboarding-sdk-common/pom.xml b/libs/onboarding-sdk-common/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>it.pagopa.selfcare</groupId>
         <artifactId>onboarding-sdk-pom</artifactId>
-        <version>0.4.1</version>
+        <version>0.5.0</version>
         <relativePath>../onboarding-sdk-pom</relativePath>
     </parent>
     <artifactId>onboarding-sdk-common</artifactId>

diff --git a/...arding-sdk-common/src/main/java/it/pagopa/selfcare/onboarding/common/InstitutionType.java b/...arding-sdk-common/src/main/java/it/pagopa/selfcare/onboarding/common/InstitutionType.java
@@ -11,5 +11,6 @@ public enum InstitutionType {
     AS,
     REC,
     CON,
-    PRV
+    PRV,
+    GPU
 }
diff --git a/libs/onboarding-sdk-crypto/pom.xml b/libs/onboarding-sdk-crypto/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>it.pagopa.selfcare</groupId>
         <artifactId>onboarding-sdk-pom</artifactId>
-        <version>0.4.1</version>
+        <version>0.5.0</version>
         <relativePath>../onboarding-sdk-pom</relativePath>
     </parent>
     <artifactId>onboarding-sdk-crypto</artifactId>

diff --git a/libs/onboarding-sdk-pom/pom.xml b/libs/onboarding-sdk-pom/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>onboarding-sdk-pom</artifactId>
     <packaging>pom</packaging>
     <name>onboarding-sdk-pom</name>
-    <version>0.4.1</version>
+    <version>0.5.0</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

diff --git a/libs/onboarding-sdk-product/pom.xml b/libs/onboarding-sdk-product/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <groupId>it.pagopa.selfcare</groupId>
         <artifactId>onboarding-sdk-pom</artifactId>
-        <version>0.4.1</version>
+        <version>0.5.0</version>
         <relativePath>../onboarding-sdk-pom</relativePath>
     </parent>
     <artifactId>onboarding-sdk-product</artifactId>
     <name>onboarding-sdk-product</name>
-    <version>0.4.1</version>
+    <version>0.5.0</version>
 
     <properties>
         <jackson.version>2.15.2</jackson.version>

diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml
@@ -16,6 +16,7 @@
         <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
         <sonar.coverage.exclusions>**/exception/**, **/response/**, **/request/**, **/entity/**, **/common/**, **/utils/**, **/*Constant*, **/*Config.java, **/error/**, **/filter/**, org/**</sonar.coverage.exclusions>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+        <commons-sdk-version>0.5.0</commons-sdk-version>
     </properties>
 
     <build>
@@ -77,22 +78,22 @@
                 <dependency>
                     <groupId>it.pagopa.selfcare</groupId>
                     <artifactId>onboarding-sdk-product</artifactId>
-                    <version>0.4.1</version>
+                    <version>${commons-sdk-version}</version>
                 </dependency>
                 <dependency>
                     <groupId>it.pagopa.selfcare</groupId>
                     <artifactId>onboarding-sdk-common</artifactId>
-                    <version>0.4.1</version>
+                    <version>${commons-sdk-version}</version>
                 </dependency>
                 <dependency>
                     <groupId>it.pagopa.selfcare</groupId>
                     <artifactId>onboarding-sdk-azure-storage</artifactId>
-                    <version>0.4.1</version>
+                    <version>${commons-sdk-version}</version>
                 </dependency>
                 <dependency>
                     <groupId>it.pagopa.selfcare</groupId>
                     <artifactId>onboarding-sdk-crypto</artifactId>
-                    <version>0.4.1</version>
+                    <version>${commons-sdk-version}</version>
                 </dependency>
             </dependencies>
-Original file line number
+Diff line change
@@ Expand Up / @@ -539,7 +539,8 @@ @@
               "AS",
               "REC",
               "CON",
-              "PRV"
+              "PRV",
+              "GPU"
             ],
             "type": "string"
           },
@@ Expand Down @@