diff --git a/CHANGELOG.md b/CHANGELOG.md index 872c0a6..e2c9c8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [v2.3.0] - [2010-11-17] + +support for the new IAM added + ## [v2.2.1] - [2019-01-14] endpoint updated for https diff --git a/FUNDING.md b/FUNDING.md new file mode 100644 index 0000000..6fa9eac --- /dev/null +++ b/FUNDING.md @@ -0,0 +1,26 @@ +# Acknowledgments + +The projects leading to this software have received funding from a series of European Union programmes including: + +- the Sixth Framework Programme for Research and Technological Development + - [DILIGENT](https://cordis.europa.eu/project/id/004260) (grant no. 004260). +- the Seventh Framework Programme for research, technological development and demonstration + - [D4Science](https://cordis.europa.eu/project/id/212488) (grant no. 212488); + - [D4Science-II](https://cordis.europa.eu/project/id/239019) (grant no.239019); + - [ENVRI](https://cordis.europa.eu/project/id/283465) (grant no. 283465); + - [iMarine](https://cordis.europa.eu/project/id/283644) (grant no. 283644); + - [EUBrazilOpenBio](https://cordis.europa.eu/project/id/288754) (grant no. 288754). +- the H2020 research and innovation programme + - [SoBigData](https://cordis.europa.eu/project/id/654024) (grant no. 654024); + - [PARTHENOS](https://cordis.europa.eu/project/id/654119) (grant no. 654119); + - [EGI-Engage](https://cordis.europa.eu/project/id/654142) (grant no. 654142); + - [ENVRI PLUS](https://cordis.europa.eu/project/id/654182) (grant no. 654182); + - [BlueBRIDGE](https://cordis.europa.eu/project/id/675680) (grant no. 675680); + - [PerformFISH](https://cordis.europa.eu/project/id/727610) (grant no. 727610); + - [AGINFRA PLUS](https://cordis.europa.eu/project/id/731001) (grant no. 731001); + - [DESIRA](https://cordis.europa.eu/project/id/818194) (grant no. 818194); + - [ARIADNEplus](https://cordis.europa.eu/project/id/823914) (grant no. 823914); + - [RISIS 2](https://cordis.europa.eu/project/id/824091) (grant no. 824091); + - [EOSC-Pillar](https://cordis.europa.eu/project/id/857650) (grant no. 857650); + - [Blue Cloud](https://cordis.europa.eu/project/id/862409) (grant no. 862409); + - [SoBigData-PlusPlus](https://cordis.europa.eu/project/id/871042) (grant no. 871042); \ No newline at end of file diff --git a/changelog.xml b/changelog.xml deleted file mode 100644 index da673e4..0000000 --- a/changelog.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - First Release - - - new model for auth2 - - - added set and reset of scope in AuthorizedTask - - - added the support for authorization control library - - - added ListMapper - - - thread local to manage OIDC UMA bearer token added - - \ No newline at end of file diff --git a/descriptor.xml b/descriptor.xml deleted file mode 100644 index ee6ba58..0000000 --- a/descriptor.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - servicearchive - - tar.gz - - / - - - . - / - true - - README.md - LICENSE.md - changelog.xml - profile.xml - - 755 - true - - - - - target/${build.finalName}.jar - /${artifactId} - - - - \ No newline at end of file diff --git a/distro/LICENSE b/distro/LICENSE deleted file mode 100644 index 3695e26..0000000 --- a/distro/LICENSE +++ /dev/null @@ -1 +0,0 @@ -${gcube.license} diff --git a/distro/README b/distro/README deleted file mode 100644 index 8055c89..0000000 --- a/distro/README +++ /dev/null @@ -1,64 +0,0 @@ -The gCube System - ${name} --------------------------------------------------- - -${description} - - -${gcube.description} - -${gcube.funding} - - -Version --------------------------------------------------- - -${version} (${buildDate}) - -Please see the file named "changelog.xml" in this directory for the release notes. - -Authors --------------------------------------------------- - -* Lucio Lelii (lucio.lelii-AT-isti.cnr.it), CNR, Italy - -Maintainers --------------------------------------------------- - -* Lucio Lelii (lucio.lelii-AT-isti.cnr.it), CNR, Italy - -Download information --------------------------------------------------- - -Source code is available from SVN: - ${scm.url} - -Binaries can be downloaded from the gCube website: - ${gcube.website} - - -Installation --------------------------------------------------- - -Installation documentation is available on-line in the gCube Wiki: - ${gcube.wikiRoot} - -Documentation --------------------------------------------------- - -Documentation is available on-line in the gCube Wiki: - ${gcube.wikiRoot} - -Support --------------------------------------------------- - -Bugs and support requests can be reported in the gCube issue tracking tool: - ${gcube.issueTracking} - - -Licensing --------------------------------------------------- - -This software is licensed under the terms you may find in the file named "LICENSE" in this directory. - - - diff --git a/distro/changelog.xml b/distro/changelog.xml deleted file mode 100644 index a6af3ad..0000000 --- a/distro/changelog.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - First Release - - - new model for auth2 - - - added set and reset of scope in AuthorizedTask - - - added the support for authorization control library - - \ No newline at end of file diff --git a/distro/descriptor.xml b/distro/descriptor.xml deleted file mode 100644 index 50e73a4..0000000 --- a/distro/descriptor.xml +++ /dev/null @@ -1,36 +0,0 @@ - - servicearchive - - tar.gz - - / - - - ${distroDirectory} - / - true - - README - LICENSE - changelog.xml - profile.xml - - 755 - true - - - - - - target/${build.finalName}.jar - /${artifactId} - - - diff --git a/distro/profile.xml b/distro/profile.xml deleted file mode 100644 index 91c49e4..0000000 --- a/distro/profile.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - Service - - ${description} - Common - ${artifactId} - 1.0.0 - - - ${artifactId} - ${version} - - ${groupId} - ${artifactId} - ${version} - - - ${build.finalName}.jar - - - - - - diff --git a/pom.xml b/pom.xml index bf1d0d2..eb0b399 100644 --- a/pom.xml +++ b/pom.xml @@ -3,8 +3,7 @@ 4.0.0 org.gcube.common common-authorization - 2.3.0-SNAPSHOT - 2.2.1 + 2.3.0 authorization service common library @@ -18,9 +17,6 @@ scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git https://code-repo.d4science.org/gCubeSystem/common-authorization - - distro - @@ -74,25 +70,7 @@ - - - org.apache.maven.plugins - maven-assembly-plugin - - - descriptor.xml - - - - - servicearchive - install - - single - - - - +