From 8a067e023d6012e0d31d012fdc7afb373bbd2950 Mon Sep 17 00:00:00 2001 From: Mauro Mugnaini Date: Thu, 20 May 2021 18:24:32 +0200 Subject: [PATCH] Prepared for new 1.1.0 version, removed deependency from portal-bom distribution since target runtime is keycloak --- CHANGELOG.md | 2 ++ avatar-importer/CHANGELOG.md | 2 ++ avatar-importer/pom.xml | 1 + avatar-realm-resource/CHANGELOG.md | 2 ++ avatar-storage/CHANGELOG.md | 3 +++ delete-account/CHANGELOG.md | 2 ++ event-listener-provider/CHANGELOG.md | 2 ++ identity-provider-mapper/CHANGELOG.md | 3 +++ keycloak-d4science-bundle/CHANGELOG.md | 3 +++ keycloak-d4science-bundle/pom.xml | 23 ++++++++++++----------- ldap-storage-mapper/CHANGELOG.md | 2 ++ pom.xml | 25 +++++++++++++++++-------- 12 files changed, 51 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb9c1a2..1292f43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for "keycloak-d4science-spi-parent" +## [v1.1.0-SNAPSHOT] + ## [v1.0.1] user put in disable status and avatar deleted at user delete request, params returned correctly adding avatar diff --git a/avatar-importer/CHANGELOG.md b/avatar-importer/CHANGELOG.md index 37f86dc..469f166 100644 --- a/avatar-importer/CHANGELOG.md +++ b/avatar-importer/CHANGELOG.md @@ -2,6 +2,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for "avatar-importer" +## [v1.1.0-SNAPSHOT] + ## [v1.0.1] Changes in other sub-components diff --git a/avatar-importer/pom.xml b/avatar-importer/pom.xml index d46ea05..6814b4b 100644 --- a/avatar-importer/pom.xml +++ b/avatar-importer/pom.xml @@ -32,6 +32,7 @@ com.googlecode.json-simple json-simple + ${json-simple-version} diff --git a/avatar-realm-resource/CHANGELOG.md b/avatar-realm-resource/CHANGELOG.md index 1eb3608..1777ae7 100644 --- a/avatar-realm-resource/CHANGELOG.md +++ b/avatar-realm-resource/CHANGELOG.md @@ -2,6 +2,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for "avatar-realm-resource" +## [v1.1.0-SNAPSHOT] + ## [v1.0.1] Params returned correctly adding avatar diff --git a/avatar-storage/CHANGELOG.md b/avatar-storage/CHANGELOG.md index 115edea..db07645 100644 --- a/avatar-storage/CHANGELOG.md +++ b/avatar-storage/CHANGELOG.md @@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for "avatar-storage" +## [v1.1.0-SNAPSHOT] +Changes in other sub-components + ## [v1.0.1] Changes in other sub-components diff --git a/delete-account/CHANGELOG.md b/delete-account/CHANGELOG.md index 4eb17bf..3e7460f 100644 --- a/delete-account/CHANGELOG.md +++ b/delete-account/CHANGELOG.md @@ -2,6 +2,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for "delete-account" +## [v1.1.0-SNAPSHOT] + ## [v1.0.1] User put in disable status and avatar deleted at user delete request diff --git a/event-listener-provider/CHANGELOG.md b/event-listener-provider/CHANGELOG.md index 24b3d24..82ac644 100644 --- a/event-listener-provider/CHANGELOG.md +++ b/event-listener-provider/CHANGELOG.md @@ -2,6 +2,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for "event-listener-provider" +## [v1.1.0-SNAPSHOT] + ## [v1.0.1] Only interesting events are published diff --git a/identity-provider-mapper/CHANGELOG.md b/identity-provider-mapper/CHANGELOG.md index 51e6ea1..8ab2e13 100644 --- a/identity-provider-mapper/CHANGELOG.md +++ b/identity-provider-mapper/CHANGELOG.md @@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for "identity-provider-mapper" +## [v1.1.0] +changes in other sub-components + ## [v1.0.1] changes in other sub-components diff --git a/keycloak-d4science-bundle/CHANGELOG.md b/keycloak-d4science-bundle/CHANGELOG.md index a83c8d9..ba93440 100644 --- a/keycloak-d4science-bundle/CHANGELOG.md +++ b/keycloak-d4science-bundle/CHANGELOG.md @@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for "keycloak-d4science-bundle" +## [v1.1.0-SNAPSHOT] +changes in sub-components + ## [v1.0.1] changes in sub-components diff --git a/keycloak-d4science-bundle/pom.xml b/keycloak-d4science-bundle/pom.xml index a5509f6..0ddf588 100644 --- a/keycloak-d4science-bundle/pom.xml +++ b/keycloak-d4science-bundle/pom.xml @@ -13,17 +13,17 @@ keycloak-d4science-bundle ear - - - - org.gcube.distribution - maven-portal-bom - 3.6.0 - pom - import - - - + + + + + + + + + + + scm:git:https://code-repo.d4science.org/gCubeSystem/${project.parent.artifactId}.git @@ -72,6 +72,7 @@ com.googlecode.json-simple json-simple + {json-simple-version} runtime diff --git a/ldap-storage-mapper/CHANGELOG.md b/ldap-storage-mapper/CHANGELOG.md index 4e742bc..c824af1 100644 --- a/ldap-storage-mapper/CHANGELOG.md +++ b/ldap-storage-mapper/CHANGELOG.md @@ -2,6 +2,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for "keycloak-extension-spi" +## [v1.1.0-SNAPSHOT] + ## [v1.0.1] changes in other sub-components diff --git a/pom.xml b/pom.xml index 6e418c2..6f38947 100644 --- a/pom.xml +++ b/pom.xml @@ -12,9 +12,13 @@ org.gcube keycloak-d4science-spi-parent - 1.0.1 + 1.1.0-SNAPSHOT pom + + 1.1 + + avatar-storage avatar-realm-resource @@ -35,13 +39,13 @@ pom import - - org.gcube.distribution - maven-portal-bom - 3.6.0 - pom - import - + + + + + + + @@ -80,6 +84,11 @@ jboss-logging provided + + com.googlecode.json-simple + json-simple + ${json-simple-version} + org.slf4j slf4j-log4j12