conflict resolved

pagopa · May 20, 2024 · 5766fb3 · 5766fb3
2 parents 57359a2 + ce23a3d
commit 5766fb3
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: pagopa-nodo-cfg-data-migration
 description: A microservice that permits the migration from Nexi's Oracle database to PagoPA's PostgreSQL database
 type: application
-version: 0.79.0
-appVersion: 1.0.1-8-nexi-conf
+version: 0.80.0
+appVersion: 1.0.1-9-nexi-conf
 dependencies:
   - name: microservice-chart
     version: 2.8.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-nodo-cfg-data-migration
-    tag: "1.0.1-8-nexi-conf"
+    tag: "1.0.1-9-nexi-conf"
     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-nodo-cfg-data-migration
-    tag: "1.0.1-8-nexi-conf"
+    tag: "1.0.1-9-nexi-conf"
     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-nodo-cfg-data-migration
-    tag: "1.0.1-8-nexi-conf"
+    tag: "1.0.1-9-nexi-conf"
     pullPolicy: Always
   livenessProbe:
     httpGet:
@@ -64,9 +64,8 @@ microservice-chart:
   envConfig:
     WEBSITE_SITE_NAME: 'pagopanodocfgdatamigration'
     ENV: 'Azure Kubernetes'
-    #   SRC
-#    ORACLEDB_CONNECTION_STRING: "jdbc:oracle:thin:@(DESCRIPTION=(ENABLE=BROKEN)(ADDRESS=(PROTOCOL=tcp)(PORT=1524)(HOST=db-nodo-pagamenti.u.db-nodo-pagamenti.com))(CONNECT_DATA=(SERVICE_NAME=NDPSPCA_NODO4_CFG))(SO_KEEPALIVE=true)(TCP_KEEPIDLE=60)(TCP_KEEPINTVL=30)(TCP_KEEPCNT=15))"
-#    jdbc:oracle:thin:@db-nodo-pagamenti-prf.u.db-nodo-pagamenti.com:1524/NDPSPCST
+    #    ORACLEDB_CONNECTION_STRING: "jdbc:oracle:thin:@(DESCRIPTION=(ENABLE=BROKEN)(ADDRESS=(PROTOCOL=tcp)(PORT=1524)(HOST=db-nodo-pagamenti.u.db-nodo-pagamenti.com))(CONNECT_DATA=(SERVICE_NAME=NDPSPCA_NODO4_CFG))(SO_KEEPALIVE=true)(TCP_KEEPIDLE=60)(TCP_KEEPINTVL=30)(TCP_KEEPCNT=15))"
+    #    jdbc:oracle:thin:@db-nodo-pagamenti-prf.u.db-nodo-pagamenti.com:1524/NDPSPCST
 
     ORACLEDB_CONNECTION_STRING: "jdbc:oracle:thin:@(DESCRIPTION=(ENABLE=BROKEN)(ADDRESS=(PROTOCOL=tcp)(PORT=1524)(HOST=db-nodo-pagamenti-prf.u.db-nodo-pagamenti.com))(CONNECT_DATA=(SERVICE_NAME=NDPSPCST))(SO_KEEPALIVE=true)(TCP_KEEPIDLE=60)(TCP_KEEPINTVL=30)(TCP_KEEPCNT=15))"
     ORACLEDB_USERNAME: "NODO4_CFG"

diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -4,7 +4,7 @@
     "description": "A microservice that permits the migration from Nexi's Oracle database to PagoPA's PostgreSQL database",
     "termsOfService": "https://www.pagopa.gov.it/",
     "title": "data-migration",
-    "version": "1.0.1-8-nexi-conf"
+    "version": "1.0.1-9-nexi-conf"
   },
   "servers": [
     {

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>it.gov.pagopa.nodo</groupId>
 	<artifactId>data-migration</artifactId>
-	<version>1.0.1-8-nexi-conf</version>
+	<version>1.0.1-9-nexi-conf</version>
 	<description>A microservice that permits the migration from Nexi's Oracle database to PagoPA's PostgreSQL database</description>
 	<properties>
 		<java.version>17</java.version>