From 03d5bd7b6ec32aecba4fffeb45fb51fa1636c33c Mon Sep 17 00:00:00 2001 From: "GRUPOGMV\\ssis" Date: Tue, 17 Sep 2024 13:17:39 +0200 Subject: [PATCH 1/5] =?UTF-8?q?Actualizaci=C3=B3n=20a=20la=200.8.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/libs.versions.toml | 17 +++++++++-------- resources/sql/zend_new_database_version.sql | 6 ++++++ 2 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 resources/sql/zend_new_database_version.sql diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b626003..a6abe56 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,20 +2,21 @@ format.version = "1.1" [versions] -assertj = "3.26.0" +assertj = "3.26.3" aws = "2.26.7" -edc = "0.7.1" +edc = "0.8.1" edc-aws = "0.7.1-SNAPSHOT" +dataplane = "0.8.1" jakarta-json = "2.0.1" -jersey = "3.1.7" +jersey = "3.1.8" junit-pioneer = "2.2.0" -jupiter = "5.10.2" +jupiter = "5.11.0" mockito = "5.2.0" -parsson = "1.1.6" -postgres = "42.7.3" +parsson = "1.1.7" +postgres = "42.7.4" rsApi = "4.0.0" rseeApi = "10.0.0" -swagger-annotations-jakarta = "2.2.21" +swagger-annotations-jakarta = "2.2.23" lombok = "1.18.30" [libraries] @@ -35,7 +36,7 @@ edc-control-plane-api-client = { module = "org.eclipse.edc:control-plane-api-cli edc-control-plane-core = { module = "org.eclipse.edc:control-plane-core", version.ref = "edc" } edc-control-plane-spi = { module = "org.eclipse.edc:control-plane-spi", version.ref = "edc" } edc-control-plane-transform = { module = "org.eclipse.edc:control-plane-transform", version.ref = "edc" } -edc-data-plane-control-api = { module = "org.eclipse.edc:data-plane-control-api", version.ref = "edc" } +edc-data-plane-control-api = { module = "org.eclipse.edc:data-plane-control-api", version.ref = "dataplane" } edc-data-plane-public-api = { module = "org.eclipse.edc:data-plane-public-api-v2", version.ref = "edc" } edc-data-plane-core = { module = "org.eclipse.edc:data-plane-core", version.ref = "edc" } edc-data-plane-http = { module = "org.eclipse.edc:data-plane-http", version.ref = "edc" } diff --git a/resources/sql/zend_new_database_version.sql b/resources/sql/zend_new_database_version.sql new file mode 100644 index 0000000..7964dd6 --- /dev/null +++ b/resources/sql/zend_new_database_version.sql @@ -0,0 +1,6 @@ +ALTER TABLE edc_policydefinitions +ADD COLUMN IF NOT EXISTS profiles JSON; +COMMENT ON COLUMN edc_policydefinitions.profiles IS 'Java List serialized as JSON'; + +ALTER TABLE edc_data_plane +ADD COLUMN IF NOT EXISTS transfer_type_destination VARCHAR; \ No newline at end of file From 7a2b12e27ace8e5f0e52e9501479d6308a57616c Mon Sep 17 00:00:00 2001 From: "GRUPOGMV\\ssis" Date: Tue, 17 Sep 2024 13:46:38 +0200 Subject: [PATCH 2/5] Clean --- gradle/libs.versions.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a6abe56..3df7cbe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,6 @@ assertj = "3.26.3" aws = "2.26.7" edc = "0.8.1" edc-aws = "0.7.1-SNAPSHOT" -dataplane = "0.8.1" jakarta-json = "2.0.1" jersey = "3.1.8" junit-pioneer = "2.2.0" @@ -36,7 +35,7 @@ edc-control-plane-api-client = { module = "org.eclipse.edc:control-plane-api-cli edc-control-plane-core = { module = "org.eclipse.edc:control-plane-core", version.ref = "edc" } edc-control-plane-spi = { module = "org.eclipse.edc:control-plane-spi", version.ref = "edc" } edc-control-plane-transform = { module = "org.eclipse.edc:control-plane-transform", version.ref = "edc" } -edc-data-plane-control-api = { module = "org.eclipse.edc:data-plane-control-api", version.ref = "dataplane" } +edc-data-plane-control-api = { module = "org.eclipse.edc:data-plane-control-api", version.ref = "edc" } edc-data-plane-public-api = { module = "org.eclipse.edc:data-plane-public-api-v2", version.ref = "edc" } edc-data-plane-core = { module = "org.eclipse.edc:data-plane-core", version.ref = "edc" } edc-data-plane-http = { module = "org.eclipse.edc:data-plane-http", version.ref = "edc" } From e49424091312ad5259b4d47025eba8e12a06a4a9 Mon Sep 17 00:00:00 2001 From: "GRUPOGMV\\ssis" Date: Wed, 18 Sep 2024 08:56:24 +0200 Subject: [PATCH 3/5] Versiones dependencias 0.8.1 --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3df7cbe..a6a8f28 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,10 +9,10 @@ edc-aws = "0.7.1-SNAPSHOT" jakarta-json = "2.0.1" jersey = "3.1.8" junit-pioneer = "2.2.0" -jupiter = "5.11.0" +jupiter = "5.10.3" mockito = "5.2.0" -parsson = "1.1.7" -postgres = "42.7.4" +parsson = "1.1.6" +postgres = "42.7.3" rsApi = "4.0.0" rseeApi = "10.0.0" swagger-annotations-jakarta = "2.2.23" From 96a1f4d90f909bca1af5ee31d56315517eb42d54 Mon Sep 17 00:00:00 2001 From: "GRUPOGMV\\ssis" Date: Wed, 18 Sep 2024 09:15:11 +0200 Subject: [PATCH 4/5] renombrados ficheros --- resources/sql/{asset-schema.sql => 060_asset-schema.sql} | 0 ...t-definition-schema.sql => 060_contract-definition-schema.sql} | 0 ...negotiation-schema.sql => 060_contract-negotiation-schema.sql} | 0 .../sql/{data-plane-schema.sql => 060_data-plane-schema.sql} | 0 resources/sql/{edr-index-schema.sql => 060_edr-index-schema.sql} | 0 ...erated-catalog-schema.sql => 060_federated-catalog-schema.sql} | 0 ...icy-definition-schema.sql => 060_policy-definition-schema.sql} | 0 ...ransfer-process-schema.sql => 060_transfer-process-schema.sql} | 0 .../sql/{vocabulary-schema.sql => 060_vocabulary-schema.sql} | 0 ...ase_version.sql => 070_update_edc_from_0.7.0_to_0.8.1.sql.sql} | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename resources/sql/{asset-schema.sql => 060_asset-schema.sql} (100%) rename resources/sql/{contract-definition-schema.sql => 060_contract-definition-schema.sql} (100%) rename resources/sql/{contract-negotiation-schema.sql => 060_contract-negotiation-schema.sql} (100%) rename resources/sql/{data-plane-schema.sql => 060_data-plane-schema.sql} (100%) rename resources/sql/{edr-index-schema.sql => 060_edr-index-schema.sql} (100%) rename resources/sql/{federated-catalog-schema.sql => 060_federated-catalog-schema.sql} (100%) rename resources/sql/{policy-definition-schema.sql => 060_policy-definition-schema.sql} (100%) rename resources/sql/{transfer-process-schema.sql => 060_transfer-process-schema.sql} (100%) rename resources/sql/{vocabulary-schema.sql => 060_vocabulary-schema.sql} (100%) rename resources/sql/{zend_new_database_version.sql => 070_update_edc_from_0.7.0_to_0.8.1.sql.sql} (100%) diff --git a/resources/sql/asset-schema.sql b/resources/sql/060_asset-schema.sql similarity index 100% rename from resources/sql/asset-schema.sql rename to resources/sql/060_asset-schema.sql diff --git a/resources/sql/contract-definition-schema.sql b/resources/sql/060_contract-definition-schema.sql similarity index 100% rename from resources/sql/contract-definition-schema.sql rename to resources/sql/060_contract-definition-schema.sql diff --git a/resources/sql/contract-negotiation-schema.sql b/resources/sql/060_contract-negotiation-schema.sql similarity index 100% rename from resources/sql/contract-negotiation-schema.sql rename to resources/sql/060_contract-negotiation-schema.sql diff --git a/resources/sql/data-plane-schema.sql b/resources/sql/060_data-plane-schema.sql similarity index 100% rename from resources/sql/data-plane-schema.sql rename to resources/sql/060_data-plane-schema.sql diff --git a/resources/sql/edr-index-schema.sql b/resources/sql/060_edr-index-schema.sql similarity index 100% rename from resources/sql/edr-index-schema.sql rename to resources/sql/060_edr-index-schema.sql diff --git a/resources/sql/federated-catalog-schema.sql b/resources/sql/060_federated-catalog-schema.sql similarity index 100% rename from resources/sql/federated-catalog-schema.sql rename to resources/sql/060_federated-catalog-schema.sql diff --git a/resources/sql/policy-definition-schema.sql b/resources/sql/060_policy-definition-schema.sql similarity index 100% rename from resources/sql/policy-definition-schema.sql rename to resources/sql/060_policy-definition-schema.sql diff --git a/resources/sql/transfer-process-schema.sql b/resources/sql/060_transfer-process-schema.sql similarity index 100% rename from resources/sql/transfer-process-schema.sql rename to resources/sql/060_transfer-process-schema.sql diff --git a/resources/sql/vocabulary-schema.sql b/resources/sql/060_vocabulary-schema.sql similarity index 100% rename from resources/sql/vocabulary-schema.sql rename to resources/sql/060_vocabulary-schema.sql diff --git a/resources/sql/zend_new_database_version.sql b/resources/sql/070_update_edc_from_0.7.0_to_0.8.1.sql.sql similarity index 100% rename from resources/sql/zend_new_database_version.sql rename to resources/sql/070_update_edc_from_0.7.0_to_0.8.1.sql.sql From 676664be4a504770d5930920abd8c2b6df9e670d Mon Sep 17 00:00:00 2001 From: "GRUPOGMV\\ssis" Date: Wed, 18 Sep 2024 09:17:03 +0200 Subject: [PATCH 5/5] sql --- ....0_to_0.8.1.sql.sql => 070_update_edc_from_0.7.0_to_0.8.1.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename resources/sql/{070_update_edc_from_0.7.0_to_0.8.1.sql.sql => 070_update_edc_from_0.7.0_to_0.8.1.sql} (100%) diff --git a/resources/sql/070_update_edc_from_0.7.0_to_0.8.1.sql.sql b/resources/sql/070_update_edc_from_0.7.0_to_0.8.1.sql similarity index 100% rename from resources/sql/070_update_edc_from_0.7.0_to_0.8.1.sql.sql rename to resources/sql/070_update_edc_from_0.7.0_to_0.8.1.sql