From de8640c40ab099922d0977a14667a934670de5a3 Mon Sep 17 00:00:00 2001 From: lucio Date: Mon, 30 May 2022 18:31:31 +0200 Subject: [PATCH 01/20] added gcube security library --- CHANGELOG.md | 4 ++++ pom.xml | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ca928b..0f1591e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for gCube Smartgears Bom +## [v3.0.0-SNAPSHOT] + +- moved to smartgears 4.0.0 + ## [v2.2.0] - enhanced gcube-model version range diff --git a/pom.xml b/pom.xml index 3fd04de..ff06960 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.gcube.distribution gcube-smartgears-bom - 2.2.0 + 3.0.0-SNAPSHOT pom gCube Smartgears Bom @@ -34,12 +34,18 @@ org.gcube.distribution gcube-bom - 2.1.0 + 3.0.0-SNAPSHOT pom import + + org.gcube.common + common-security + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + provided + org.gcube.core common-encryption @@ -170,21 +176,15 @@ org.gcube.core common-smartgears - [3.0.0,4.0.0-SNAPSHOT) + [4.0.0-SNAPSHOT,5.0.0-SNAPSHOT) provided org.gcube.core common-smartgears-app - [2.0.0,3.0.0-SNAPSHOT) + [3.0.0-SNAPSHOT,4.0.0-SNAPSHOT) compile - - org.gcube.core - common-smartgears-utils - [1.0.0,2.0.0-SNAPSHOT) - provided - org.gcube.core common-events From 7a445074a7ab729df128f97d0a0541c041e9ded3 Mon Sep 17 00:00:00 2001 From: lucio Date: Mon, 30 May 2022 18:56:28 +0200 Subject: [PATCH 02/20] moved common-authorization --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ff06960..f6c19ff 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ org.gcube.common common-authorization - [2.0.0,3.0.0-SNAPSHOT) + [3.0.0-SNAPSHOT,4.0.0-SNAPSHOT) provided From 17b49a4e94b778b615930e709b5d3591ca16f058 Mon Sep 17 00:00:00 2001 From: lucio Date: Mon, 6 Jun 2022 12:36:29 +0200 Subject: [PATCH 03/20] common-scope removed --- pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pom.xml b/pom.xml index f6c19ff..30273c3 100644 --- a/pom.xml +++ b/pom.xml @@ -64,12 +64,6 @@ [1.0.0,2.0.0-SNAPSHOT) provided - - org.gcube.core - common-scope - [1.0.0,2.0.0-SNAPSHOT) - provided - org.gcube.core common-scope-maps From edea6529c12cacde979a1da83bd8751fa8c5ace5 Mon Sep 17 00:00:00 2001 From: lucio Date: Fri, 10 Jun 2022 17:12:28 +0200 Subject: [PATCH 04/20] added dependencies to the new core libraries --- pom.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 30273c3..bd01e8f 100644 --- a/pom.xml +++ b/pom.xml @@ -58,10 +58,16 @@ [1.0.0,2.0.0-SNAPSHOT) provided + + org.gcube.common.security + gcube-secrets + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + provided + org.gcube.core common-gcore-stubs - [1.0.0,2.0.0-SNAPSHOT) + [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) provided @@ -79,7 +85,7 @@ org.gcube.resources.discovery ic-client - [1.0.0,2.0.0-SNAPSHOT) + [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) provided From 1df625ce9f6fd9e6dcec83241fecf98fe3ce64da Mon Sep 17 00:00:00 2001 From: lucio Date: Mon, 13 Jun 2022 11:37:08 +0200 Subject: [PATCH 05/20] updated accounting lib and encryption lib --- pom.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index bd01e8f..847a5f1 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ org.gcube.core common-encryption - [1.0.0,2.0.0-SNAPSHOT) + [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) provided @@ -125,7 +125,7 @@ org.gcube.accounting accounting-lib - [4.0.0,5.0.0-SNAPSHOT) + [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) provided @@ -162,7 +162,12 @@ provided - + + org.reflections + reflections + 0.9.10 + provided + org.slf4j slf4j-api From a984cdd2793c335a36d96d861d010e19dae861de Mon Sep 17 00:00:00 2001 From: lucio Date: Wed, 15 Jun 2022 17:56:54 +0200 Subject: [PATCH 06/20] added libs --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 847a5f1..cb01af1 100644 --- a/pom.xml +++ b/pom.xml @@ -97,14 +97,14 @@ org.gcube.common gxHTTP - [1.0.0,2.0.0-SNAPSHOT) + [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) provided org.gcube.common authorization-client - [2.0.0,3.0.0-SNAPSHOT) + [3.0.0-SNAPSHOT,4.0.0-SNAPSHOT) provided From 8648bf13452d9b2e4386f1bc9f6d5595c8e87a1f Mon Sep 17 00:00:00 2001 From: lucio lelii Date: Wed, 29 Jun 2022 10:40:30 +0200 Subject: [PATCH 07/20] resource registry model dependencies updated --- pom.xml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index cb01af1..827d3cc 100644 --- a/pom.xml +++ b/pom.xml @@ -134,34 +134,30 @@ org.gcube.information-system information-system-model - [4.1.0,5.0.0-SNAPSHOT) - provided + [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) org.gcube.resource-management gcube-model - [3.0.0,4.0.0-SNAPSHOT) - provided + [4.0.0-SNAPSHOT,5.0.0-SNAPSHOT) org.gcube.information-system resource-registry-api [4.1.0,5.0.0-SNAPSHOT) - provided org.gcube.information-system resource-registry-client [4.1.0,5.0.0-SNAPSHOT) - provided org.gcube.information-system resource-registry-publisher [4.1.0,5.0.0-SNAPSHOT) - provided + org.reflections reflections From 3bb259eac2a2e92fcf6862ae9194fd2e11de21f1 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 7 Jul 2022 18:19:48 +0200 Subject: [PATCH 08/20] Upgraded new IS ranges --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index cb01af1..72da0da 100644 --- a/pom.xml +++ b/pom.xml @@ -134,31 +134,31 @@ org.gcube.information-system information-system-model - [4.1.0,5.0.0-SNAPSHOT) + [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) provided org.gcube.resource-management gcube-model - [3.0.0,4.0.0-SNAPSHOT) + [4.0.0-SNAPSHOT,5.0.0-SNAPSHOT) provided org.gcube.information-system resource-registry-api - [4.1.0,5.0.0-SNAPSHOT) + [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) provided org.gcube.information-system resource-registry-client - [4.1.0,5.0.0-SNAPSHOT) + [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) provided org.gcube.information-system resource-registry-publisher - [4.1.0,5.0.0-SNAPSHOT) + [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) provided From 0fb090ec94444fd5f5a21782d4e4bb855289d369 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 7 Jul 2022 18:31:30 +0200 Subject: [PATCH 09/20] Fixed resource-registry-api range --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 044a2cb..cb2fdf3 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ org.gcube.information-system resource-registry-api - [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) + [4.0.0-SNAPSHOT,5.0.0-SNAPSHOT) provided From c650fae6b13fea09139a19e54d7cfb96f45e3b3f Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 15 Jul 2022 14:36:48 +0200 Subject: [PATCH 10/20] Enhanced range of resource-registry-api --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cb2fdf3..48a7797 100644 --- a/pom.xml +++ b/pom.xml @@ -146,8 +146,7 @@ org.gcube.information-system resource-registry-api - [4.0.0-SNAPSHOT,5.0.0-SNAPSHOT) - provided + [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) org.gcube.information-system From 24bc14408052fbb0eeb3867999bb6e1778f49b8b Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 20 Jul 2022 16:44:43 +0200 Subject: [PATCH 11/20] Upgraded range of gcube-model and information-system-model --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 48a7797..8fa052d 100644 --- a/pom.xml +++ b/pom.xml @@ -134,19 +134,20 @@ org.gcube.information-system information-system-model - [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) + [6.0.0-SNAPSHOT,7.0.0-SNAPSHOT) provided org.gcube.resource-management gcube-model - [4.0.0-SNAPSHOT,5.0.0-SNAPSHOT) + [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) provided org.gcube.information-system resource-registry-api [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) + provided org.gcube.information-system From 681d7ed0f167ca95f3d1bcb57b3f229ef69963a0 Mon Sep 17 00:00:00 2001 From: lucio Date: Mon, 25 Jul 2022 09:45:08 +0200 Subject: [PATCH 12/20] removed provided from old auth libraries --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8fa052d..4146612 100644 --- a/pom.xml +++ b/pom.xml @@ -105,13 +105,11 @@ org.gcube.common authorization-client [3.0.0-SNAPSHOT,4.0.0-SNAPSHOT) - provided org.gcube.common common-authorization [3.0.0-SNAPSHOT,4.0.0-SNAPSHOT) - provided From 3847154a3f4517ffd82a9c2a3e1fc0b808fa92fc Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 16 Nov 2022 11:41:01 +0100 Subject: [PATCH 13/20] Added missing dependency --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 4146612..587afe5 100644 --- a/pom.xml +++ b/pom.xml @@ -189,6 +189,12 @@ [3.0.0-SNAPSHOT,4.0.0-SNAPSHOT) compile + + org.gcube.common.core + legacy-is-publisher-connector + [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + provided + org.gcube.core common-events From 337347478dfd7110830e7a559122ff6ed08ca9c4 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 9 Feb 2023 12:18:41 +0100 Subject: [PATCH 14/20] Downgraded gcube-model version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 587afe5..b388179 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,7 @@ org.gcube.resource-management gcube-model - [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) + [4.0.0-SNAPSHOT,5.0.0-SNAPSHOT) provided From 370b971d9ab7812c8a063b50e385422925ded810 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 9 Feb 2023 12:19:23 +0100 Subject: [PATCH 15/20] Fixed changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f1591e..cad6d00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,12 +6,18 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - moved to smartgears 4.0.0 +# [V2.3.0-SNAPSHOT] + +- enhanced information-system-model version range + + ## [v2.2.0] - enhanced gcube-model version range - enhanced information-system-model version range - Upgraded gcube-bom version to 2.1.0-SNAPSHOT + ## [v2.1.1] - Enhanced gcube-bom version From 9805256b9aa68384a2d0e0c77ecf294cc58a3462 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 9 Feb 2023 15:47:37 +0100 Subject: [PATCH 16/20] Fixed resource-registry-api range --- CHANGELOG.md | 8 +++++--- pom.xml | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cad6d00..cd60d76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,13 +8,15 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # [V2.3.0-SNAPSHOT] -- enhanced information-system-model version range +- Enhanced information-system-model version range +- Enhanced gcube-model version lower bound of range +- Enhanced resource-registry-api lower bound of range ## [v2.2.0] -- enhanced gcube-model version range -- enhanced information-system-model version range +- Enhanced gcube-model version range +- Enhanced information-system-model version range - Upgraded gcube-bom version to 2.1.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index b388179..2553794 100644 --- a/pom.xml +++ b/pom.xml @@ -138,13 +138,13 @@ org.gcube.resource-management gcube-model - [4.0.0-SNAPSHOT,5.0.0-SNAPSHOT) + [4.1.0-SNAPSHOT,5.0.0-SNAPSHOT) provided org.gcube.information-system resource-registry-api - [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) + [4.3.0-SNAPSHOT,5.0.0-SNAPSHOT) provided From 4bc6b861db8dc5fbb5ed375797b89fcafed4c379 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 9 Feb 2023 16:49:14 +0100 Subject: [PATCH 17/20] Fixed CHANGELOG --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd60d76..c4ad068 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - moved to smartgears 4.0.0 -# [V2.3.0-SNAPSHOT] + +# [v2.3.0-SNAPSHOT] - Enhanced information-system-model version range - Enhanced gcube-model version lower bound of range From d91f30c2e3018763809710612dc63fc338731883 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 9 Feb 2023 17:23:36 +0100 Subject: [PATCH 18/20] Fixed resource-registry-api range --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2553794..76ac251 100644 --- a/pom.xml +++ b/pom.xml @@ -144,7 +144,7 @@ org.gcube.information-system resource-registry-api - [4.3.0-SNAPSHOT,5.0.0-SNAPSHOT) + [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) provided From 1121ea1b724828fab4249172ad6dc5d9720555c6 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 22 Feb 2023 15:33:48 +0100 Subject: [PATCH 19/20] Reconciled resource-registry version with bom for SG 3 --- CHANGELOG.md | 8 +++++++- pom.xml | 15 ++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4ad068..1f630da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [v3.0.0-SNAPSHOT] -- moved to smartgears 4.0.0 +- Moved to smartgears 4.0.0 +- Enhanced ranges of common libraries +- Enhanced ranges of gx-rest libraries +- Enhanced ranges of authorization libraries # [v2.3.0-SNAPSHOT] @@ -12,6 +15,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Enhanced information-system-model version range - Enhanced gcube-model version lower bound of range - Enhanced resource-registry-api lower bound of range +- Enhanced resource-registry-client lower bound of range +- Enhanced resource-registry-publisher lower bound of range +- Added common-utility ## [v2.2.0] diff --git a/pom.xml b/pom.xml index 76ac251..cdae53c 100644 --- a/pom.xml +++ b/pom.xml @@ -128,6 +128,15 @@ + + + org.gcube.common + common-utility + [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) + provided + + + org.gcube.information-system @@ -144,19 +153,19 @@ org.gcube.information-system resource-registry-api - [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) + [4.3.0-SNAPSHOT,5.0.0-SNAPSHOT) provided org.gcube.information-system resource-registry-client - [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) + [4.3.0-SNAPSHOT,5.0.0-SNAPSHOT) provided org.gcube.information-system resource-registry-publisher - [5.0.0-SNAPSHOT,6.0.0-SNAPSHOT) + [4.3.0-SNAPSHOT,5.0.0-SNAPSHOT) provided From c93e5413e44fd88b09f475ffdbb27bee7f456515 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 24 Feb 2023 15:08:51 +0100 Subject: [PATCH 20/20] common-utility 2.X.X has been renamed to common-utility-sg4 --- CHANGELOG.md | 3 ++- pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f630da..c93a40e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Enhanced ranges of common libraries - Enhanced ranges of gx-rest libraries - Enhanced ranges of authorization libraries +- Replaced common-utility-sg3 with common-utility-sg4 # [v2.3.0-SNAPSHOT] @@ -17,7 +18,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Enhanced resource-registry-api lower bound of range - Enhanced resource-registry-client lower bound of range - Enhanced resource-registry-publisher lower bound of range -- Added common-utility +- Added common-utility-sg3 ## [v2.2.0] diff --git a/pom.xml b/pom.xml index cdae53c..2e7956d 100644 --- a/pom.xml +++ b/pom.xml @@ -131,8 +131,8 @@ org.gcube.common - common-utility - [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) + common-utility-sg4 + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) provided