Compare commits

..

No commits in common. "master" and "v2.0.0" have entirely different histories.

3 changed files with 68 additions and 224 deletions

1
.gitignore vendored
View File

@ -1,4 +1,3 @@
target target
.classpath .classpath
.project .project
/.DS_Store

View File

@ -2,79 +2,23 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for gCube Bom # Changelog for gCube Bom
## [v4.0.0]
- Moved to jakarta ## [v2.0.0] [r5.0.0] -
- Moved to java11
## [v3.0.0] - 2023-08-03
- Moved to smartgears 4.0.0
- Keycloak client added
- Enhanced ranges of common libraries
- Enhanced ranges of gx-rest libraries
- Enhanced ranges of storage-hub libraries
- Enhanced ranges of authorization libraries
- Added new libraries for authorization
- Replaced common-utility-sg3 with common-utility-sg4
- Enhanced information-system-model version range
- Enhanced gcube-model version version 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
- Enhanced resource-registry-context-client lower bound of range
- Enhanced resource-registry-query-template-client lower bound of range
- Enhanced resource-registry-schema-client lower bound of range
## [v2.2.0] - 2023-03-09
- 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-sg3
## [v2.1.0] - 2022-10-27
- Enhanced gcube-model version range
- Enhanced information-system-model version range
- Added json-simple library version 1.1.1 [#21692]
- Added storagehub dependencies in range 2,3 [#22730] [#22872]
- Removed authorization-utils
- Enhanced logback-classic version to 1.2.4
## [v2.0.2] - 2022-03-08
- Added storagehub dependecies in range 1,2 [#22925]
- Added authorization-utils [#22550][#22871]
## [v2.0.1] - 2021-02-24
- Updated resource registry clients versions
## [v2.0.0] - 2020-11-11
- Switched JSON management to gcube-jackson [#19283] - Switched JSON management to gcube-jackson [#19283]
## [v1.5.0] - 2020-03-30 ## [v1.5.0] [r4.21.0] - 2020-03-30
- Removed -SNAPSHOT from dependencies lower bound of ranges - Removed -SNAPSHOT from dependencies lower bound of ranges
## [v1.4.0] - 2019-12-19 ## [v1.4.0] [r4.17.0] - 2019-12-19
- Removed -SNAPSHOT from dependencies lower bound of ranges - Removed -SNAPSHOT from dependencies lower bound of ranges
## [v1.3.0] - 2019-05-27 ## [v1.3.0] [r4.14.0] - 2019-05-27
- Added gxREST Dependency - Added gxREST Dependency
- Added gxJRS Dependency - Added gxJRS Dependency
@ -82,33 +26,33 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- Added javax.ws.rs-api compatible with defined jersey version - Added javax.ws.rs-api compatible with defined jersey version
## [v1.2.1] - 2019-02-26 ## [v1.2.1] [r4.13.1] - 2019-02-26
- Upgraded slf4j-api from 1.7.5 to 1.7.25 - Upgraded slf4j-api from 1.7.5 to 1.7.25
- Added gxHTTP Dependency - Added gxHTTP Dependency
## [v1.2.0] - 2018-11-20 ## [v1.2.0] [r4.13.0] - 2018-11-20
- Updated resource-registry related clients and libraries [#11941] - Updated resource-registry related clients and libraries [#11941]
## [v1.1.0] - 2017-11-29 ## [v1.1.0] [r4.8.0] - 2017-11-29
- Added Jackson libraries [#9835] - Added Jackson libraries [#9835]
## [v1.0.2] - 2017-06-06 ## [v1.0.2] [r4.5.0] - 2017-06-06
- Changed version of accounting-lib and document-store-lib - Changed version of accounting-lib and document-store-lib
## [v1.0.1] - 2016-12-15 ## [v1.0.1] [r4.2.0] - 2016-12-15
- Removed wrong scope on dependency declaration - Removed wrong scope on dependency declaration
## [v1.0.0] - 2016-11-07 ## [v1.0.0] [r4.1.0] - 2016-11-07
- First Release - First Release

215
pom.xml
View File

@ -5,264 +5,176 @@
<parent> <parent>
<groupId>org.gcube.tools</groupId> <groupId>org.gcube.tools</groupId>
<artifactId>maven-parent</artifactId> <artifactId>maven-parent</artifactId>
<version>1.2.0</version> <version>1.1.0</version>
</parent> </parent>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-bom</artifactId> <artifactId>gcube-bom</artifactId>
<version>4.0.0</version> <version>2.0.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>gCube BOM</name> <name>gCube BOM</name>
<description>gCube Bom contains commons gCube library versions to avoid <description>gCube Bom contains commons gCube library versions to avoid version conflicts among gCube components</description>
version conflicts among gCube components</description>
<properties> <properties>
<gcube-jackson.version>2.8.11</gcube-jackson.version> <gcube-jackson.version>2.8.11</gcube-jackson.version>
<jersey.version>3.1.5</jersey.version> <jersey.version>2.25.1</jersey.version>
<lombok.version>1.18.30</lombok.version>
<jakarta.version>4.0.4</jakarta.version>
<jakarta-api.version>4.0.1</jakarta-api.version>
<jaxb-impl.version>4.0.4</jaxb-impl.version>
<jaxws.version>4.0.2</jaxws.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<scm> <scm>
<connection> <connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection> <developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
<developerConnection>
scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url> <url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
</scm> </scm>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.glassfish.jersey</groupId> <groupId> org.glassfish.jersey </groupId>
<artifactId>jersey-bom</artifactId> <artifactId>jersey-bom</artifactId>
<version>${jersey.version}</version> <version>${jersey.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<!-- Added to support Java 11 JDK --> <!-- Jersey 2.25.1 is compliant with javax.ws.rs-api 2.0.1 Higher version
of Jersey uses higher version of javax.ws.rs-api. Please check javax.ws.rs-api
requirements before updating Jersey version -->
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>javax.ws.rs</groupId>
<artifactId>lombok</artifactId> <artifactId>javax.ws.rs-api</artifactId>
<version>${lombok.version}</version> <version>2.0.1</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>${jakarta-api.version}</version>
</dependency>
<!--
https://mvnrepository.com/artifact/org.glassfish.jaxb/jaxb-runtime -->
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${jaxb-impl.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb-impl.version}</version>
<scope>runtime</scope>
</dependency> </dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<version>${jakarta-api.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<version>${jaxws.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>2.1.3</version>
</dependency>
<!-- END Added to support Java 11 JDK -->
<dependency> <dependency>
<groupId>org.gcube.core</groupId> <groupId>org.gcube.core</groupId>
<artifactId>common-encryption</artifactId> <artifactId>common-encryption</artifactId>
<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version> <version>[1.0.0,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.resources</groupId> <groupId>org.gcube.resources</groupId>
<artifactId>common-gcore-resources</artifactId> <artifactId>common-gcore-resources</artifactId>
<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version> <version>[1.0.0,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.core</groupId> <groupId>org.gcube.core</groupId>
<artifactId>common-gcore-stubs</artifactId> <artifactId>common-gcore-stubs</artifactId>
<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version> <version>[1.0.0,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.core</groupId> <groupId>org.gcube.core</groupId>
<artifactId>common-scope</artifactId> <artifactId>common-scope</artifactId>
<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version> <version>[1.0.0,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.core</groupId> <groupId>org.gcube.core</groupId>
<artifactId>common-scope-maps</artifactId> <artifactId>common-scope-maps</artifactId>
<version>[1.1.1-SNAPSHOT,2.0.0-SNAPSHOT)</version> <version>[1.0.0,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.resources</groupId> <groupId>org.gcube.resources</groupId>
<artifactId>registry-publisher</artifactId> <artifactId>registry-publisher</artifactId>
<version>[1.3.2,2.0.0-SNAPSHOT)</version> <version>[1.0.0,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.resources.discovery</groupId> <groupId>org.gcube.resources.discovery</groupId>
<artifactId>ic-client</artifactId> <artifactId>ic-client</artifactId>
<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version> <version>[1.0.0,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.resources.discovery</groupId> <groupId>org.gcube.resources.discovery</groupId>
<artifactId>discovery-client</artifactId> <artifactId>discovery-client</artifactId>
<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version> <version>[1.0.0,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<!-- Storagehub dependencies -->
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>storagehub-model</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>storagehub-client-library</artifactId>
<version>[3.0.0-SNAPSHOT, 4.0.0-SNAPSHOT)</version>
</dependency>
<!-- END Storagehub dependencies -->
<!-- Facets Based Resource Model related dependencies --> <!-- Facets Based Resource Model related dependencies -->
<dependency> <dependency>
<groupId>org.gcube.information-system</groupId> <groupId>org.gcube.information-system</groupId>
<artifactId>information-system-model</artifactId> <artifactId>information-system-model</artifactId>
<version>[7.0.0-SNAPSHOT,8.0.0-SNAPSHOT)</version> <version>[4.0.0,5.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.resource-management</groupId> <groupId>org.gcube.resource-management</groupId>
<artifactId>gcube-model</artifactId> <artifactId>gcube-model</artifactId>
<version>[5.0.0-SNAPSHOT,6.0.0-SNAPSHOT)</version> <version>[3.0.0,4.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.information-system</groupId> <groupId>org.gcube.information-system</groupId>
<artifactId>resource-registry-api</artifactId> <artifactId>resource-registry-api</artifactId>
<version>[6.0.0-SNAPSHOT,7.0.0-SNAPSHOT)</version> <version>[4.0.0,5.0.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>org.gcube.information-system</groupId>
<artifactId>resource-registry-client</artifactId>
<version>[4.4.0-SNAPSHOT,5.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.information-system</groupId> <groupId>org.gcube.information-system</groupId>
<artifactId>resource-registry-publisher</artifactId> <artifactId>resource-registry-publisher</artifactId>
<version>[4.4.0-SNAPSHOT,5.0.0-SNAPSHOT)</version> <version>[4.0.0,5.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.information-system</groupId> <groupId>org.gcube.information-system</groupId>
<artifactId>resource-registry-context-client</artifactId> <artifactId>resource-registry-client</artifactId>
<version>[4.1.1-SNAPSHOT,5.0.0-SNAPSHOT)</version> <version>[4.0.0,5.0.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>org.gcube.information-system</groupId>
<artifactId>resource-registry-query-template-client</artifactId>
<version>[1.1.1-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>org.gcube.information-system</groupId>
<artifactId>resource-registry-schema-client</artifactId>
<version>[4.2.1-SNAPSHOT,5.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<!-- END Facets Based Resource Model related dependencies --> <!-- END Facets Based Resource Model related dependencies -->
<!-- Clients Related Dependencies --> <!-- Clients Related Dependencies -->
<dependency> <dependency>
<groupId>org.gcube.core</groupId> <groupId>org.gcube.core</groupId>
<artifactId>common-generic-clients</artifactId> <artifactId>common-generic-clients</artifactId>
<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version> <version>[1.0.0,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.core</groupId> <groupId>org.gcube.core</groupId>
<artifactId>common-gcube-calls</artifactId> <artifactId>common-gcube-calls</artifactId>
<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version> <version>[1.0.0,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.core</groupId> <groupId>org.gcube.core</groupId>
<artifactId>common-jaxws-calls</artifactId> <artifactId>common-jaxws-calls</artifactId>
<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version> <version>[1.0.0,2.0.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>common-jaxrs-client</artifactId>
<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.core</groupId> <groupId>org.gcube.core</groupId>
<artifactId>common-clients</artifactId> <artifactId>common-clients</artifactId>
<version>[3.0.0-SNAPSHOT,4.0.0-SNAPSHOT)</version> <version>[2.0.0,3.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.core</groupId> <groupId>org.gcube.core</groupId>
<artifactId>common-fw-clients</artifactId> <artifactId>common-fw-clients</artifactId>
<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version> <version>[1.0.0,2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.common</groupId> <groupId>org.gcube.common</groupId>
<artifactId>gxREST</artifactId> <artifactId>gxREST</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version> <version>[1.0.0, 2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.common</groupId> <groupId>org.gcube.common</groupId>
<artifactId>gxJRS</artifactId> <artifactId>gxJRS</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version> <version>[1.0.0, 2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.common</groupId> <groupId>org.gcube.common</groupId>
<artifactId>gxHTTP</artifactId> <artifactId>gxHTTP</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version> <version>[1.0.0, 2.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<!-- END Clients Related Dependencies --> <!-- END Clients Related Dependencies -->
<!-- Authorization Related Dependencies --> <!-- Authorization Related Dependencies -->
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>common-security</artifactId>
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>org.gcube.common.security</groupId>
<artifactId>gcube-secrets</artifactId>
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency>
<dependency> <dependency>
<groupId>org.gcube.common</groupId> <groupId>org.gcube.common</groupId>
<artifactId>authorization-client</artifactId> <artifactId>authorization-client</artifactId>
<version>[3.0.0-SNAPSHOT,4.0.0-SNAPSHOT)</version> <version>[2.0.0,3.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.common</groupId> <groupId>org.gcube.common</groupId>
<artifactId>common-authorization</artifactId> <artifactId>common-authorization</artifactId>
<version>[3.0.0-SNAPSHOT,4.0.0-SNAPSHOT)</version> <version>[2.0.0,3.0.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>authorization-control-library</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>keycloak-client</artifactId>
<version>[2.1.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<!-- END Authorization Related Dependencies --> <!-- END Authorization Related Dependencies -->
<!-- Accounting Related Dependencies --> <!-- Accounting Related Dependencies -->
<dependency> <dependency>
<groupId>org.gcube.data.publishing</groupId> <groupId>org.gcube.data.publishing</groupId>
@ -272,25 +184,22 @@
<dependency> <dependency>
<groupId>org.gcube.accounting</groupId> <groupId>org.gcube.accounting</groupId>
<artifactId>accounting-lib</artifactId> <artifactId>accounting-lib</artifactId>
<version>[5.0.0-SNAPSHOT,6.0.0-SNAPSHOT)</version> <version>[4.0.0,5.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<!-- END Accounting Related Dependencies --> <!-- END Accounting Related Dependencies -->
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
<version>1.5.0</version> <version>1.2.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>2.0.12</version> <version>1.7.25</version>
</dependency>
<!-- Added for authorization -->
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
</dependency> </dependency>
<!-- gCube Jackson --> <!-- gCube Jackson -->
<dependency> <dependency>
<groupId>org.gcube.common</groupId> <groupId>org.gcube.common</groupId>
@ -308,16 +217,8 @@
<version>${gcube-jackson.version}</version> <version>${gcube-jackson.version}</version>
</dependency> </dependency>
<!-- END gCube Jackson --> <!-- END gCube Jackson -->
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>0.9.12</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.2</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
</project> </project>