From 840b34ed2da0d0a2a27f6a53a5d1e04c24f1855c Mon Sep 17 00:00:00 2001
From: "luca.frosini" <luca.frosini@isti.cnr.it>
Date: Tue, 5 Feb 2019 10:11:21 +0000
Subject: [PATCH] Added gxREST, gxJRS dependencies. Imported jersey-bom and
 added javax.ws.rs-api compatible with defined jersey version.

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/distributions/gcube-bom@176961 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml |  9 ++++++++-
 pom.xml              | 26 ++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index 69e75ec..94a3f7b 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xml>
 <ReleaseNotes>
+	<Changeset component="org.gcube.distribution.gcube-bom.1-2-2" date="${buildDate}">
+		<Change>Added gxREST Dependency</Change>
+		<Change>Added gxJRS Dependency</Change>
+		<Change>Imported jersey-bom</Change>
+		<Change>Added javax.ws.rs-api compatible with defined jersey version</Change>
+	</Changeset>
 	<Changeset component="org.gcube.distribution.gcube-bom.1-2-1" date="${buildDate}">
-		<Change></Change>
+		<Change>Upgraded slf4j-api from 1.7.5 to 1.7.25</Change>
+		<Change>Added gxHTTP Dependency</Change>
 	</Changeset>
 	<Changeset component="org.gcube.distribution.gcube-bom.1-2-0" date="2018-11-20">
 		<Change>Updated resource-registry related clients and libraries #11941</Change>
diff --git a/pom.xml b/pom.xml
index d180f90..a193d2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,7 @@
 
 	<properties>
 		<jackson.version>2.6.0</jackson.version>
+		<jersey.version>2.25.1</jersey.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<distroDirectory>distro</distroDirectory>
 	</properties>
@@ -28,6 +29,21 @@
 
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId> org.glassfish.jersey </groupId>
+				<artifactId>jersey-bom</artifactId>
+				<version>${jersey.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<!-- 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>
+				<groupId>javax.ws.rs</groupId>
+				<artifactId>javax.ws.rs-api</artifactId>
+				<version>2.0.1</version>
+			</dependency>
 
 			<dependency>
 				<groupId>org.gcube.core</groupId>
@@ -126,6 +142,16 @@
 				<artifactId>common-fw-clients</artifactId>
 				<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			</dependency>
+			<dependency>
+				<groupId>org.gcube.common</groupId>
+				<artifactId>gxREST</artifactId>
+				<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+			</dependency>
+			<dependency>
+				<groupId>org.gcube.common</groupId>
+				<artifactId>gxJRS</artifactId>
+				<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+			</dependency>
 			<dependency>
 				<groupId>org.gcube.common</groupId>
 				<artifactId>gxHTTP</artifactId>