From 02a4986e7b3ee4fd3fde1cbb3731057066662b3d Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Thu, 13 Aug 2020 11:53:01 +0200
Subject: [PATCH] Applying changed from code reviews
 https://code-repo.d4science.org/D-Net/dnet-hadoop/pulls/40#issuecomment-1816
 and
 https://code-repo.d4science.org/D-Net/dnet-hadoop/pulls/40#issuecomment-1818
 and
 https://code-repo.d4science.org/D-Net/dnet-hadoop/pulls/40#issuecomment-1874

---
 dhp-common/pom.xml                     |  1 -
 dhp-workflows/dhp-graph-mapper/pom.xml | 40 +-------------------------
 pom.xml                                | 30 +++++++++++++++++++
 3 files changed, 31 insertions(+), 40 deletions(-)

diff --git a/dhp-common/pom.xml b/dhp-common/pom.xml
index da8644145..1dc3208b5 100644
--- a/dhp-common/pom.xml
+++ b/dhp-common/pom.xml
@@ -91,7 +91,6 @@
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
-			<version>4.7.2</version>
 		</dependency>
 	</dependencies>
 
diff --git a/dhp-workflows/dhp-graph-mapper/pom.xml b/dhp-workflows/dhp-graph-mapper/pom.xml
index c89e9e407..a0a334e3c 100644
--- a/dhp-workflows/dhp-graph-mapper/pom.xml
+++ b/dhp-workflows/dhp-graph-mapper/pom.xml
@@ -41,44 +41,13 @@
     </build>
 
     <dependencies>
-<!--        <dependency>-->
-<!--            <groupId>org.apache.hadoop</groupId>-->
-<!--            <artifactId>hadoop-common</artifactId>-->
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <groupId>com.sun.xml.bind</groupId>-->
-<!--                    <artifactId>jaxb-impl</artifactId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
-<!--        </dependency>-->
 
         <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-compress -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.1</version>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>org.apache.hadoop</groupId>-->
-<!--            <artifactId>hadoop-aws</artifactId>-->
-<!--            <version>3.0.0</version>-->
-<!--        </dependency>-->
-
-<!--&lt;!&ndash;         https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-impl&ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.sun.xml.bind</groupId>-->
-<!--            <artifactId>jaxb-impl</artifactId>-->
-<!--            <version>2.2.11</version>-->
-<!--        </dependency>-->
-
-<!--        &lt;!&ndash; https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-core &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.sun.xml.bind</groupId>-->
-<!--            <artifactId>jaxb-core</artifactId>-->
-<!--            <version>2.2.11</version>-->
-<!--        </dependency>-->
-
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -140,21 +109,14 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpmime</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.squareup.okhttp3</groupId>-->
-<!--            <artifactId>okhttp</artifactId>-->
-<!--            <version>4.7.2</version>-->
-<!--        </dependency>-->
-            <dependency>
+        <dependency>
             <groupId>com.github.victools</groupId>
             <artifactId>jsonschema-generator</artifactId>
-            <version>4.13.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.json4s</groupId>
             <artifactId>json4s-jackson_2.11</artifactId>
-            <version>3.5.3</version>
         </dependency>
 
     </dependencies>
diff --git a/pom.xml b/pom.xml
index 4908d4db3..e88e1d51b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -417,6 +417,32 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
+
+
+			<dependency>
+				<groupId>com.squareup.okhttp3</groupId>
+				<artifactId>okhttp</artifactId>
+				<version>${okhttp.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-compress</artifactId>
+				<version>${common.compress.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.json4s</groupId>
+				<artifactId>json4s-jackson_2.11</artifactId>
+				<version>${json4s.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>com.github.victools</groupId>
+				<artifactId>jsonschema-generator</artifactId>
+				<version>${jsonschemagenerator.version}</version>
+			</dependency>
+
 		</dependencies>
 	</dependencyManagement>
 
@@ -639,5 +665,9 @@
 		<vtd.version>[2.12,3.0)</vtd.version>
 		<dnet.openaire.broker.common>3.1.0</dnet.openaire.broker.common>
 		<solr.version>7.5.0</solr.version>
+		<okhttp.version>4.7.2</okhttp.version>
+		<common.compress.version>1.1</common.compress.version>
+		<json4s.version>3.5.3</json4s.version>
+		<jsonschemagenerator.version>4.13.0</jsonschemagenerator.version>
 	</properties>
 </project>