From c8e3e4d7c321e58c5ea9a289a07913664dc00455 Mon Sep 17 00:00:00 2001
From: "sandro.labruzzo" <sandro.labruzzo@isti.cnr.it>
Date: Thu, 24 Oct 2019 10:20:31 +0200
Subject: [PATCH] Refactoring dependencies versions

---
 dhp-applications/dhp-collector-worker/pom.xml | 37 +--------
 dhp-applications/dhp-is-mapper/pom.xml        | 40 ++++++++++
 dhp-applications/pom.xml                      | 25 +++---
 dhp-common/pom.xml                            |  9 ---
 dhp-schemas/pom.xml                           | 62 +++++++++++++++
 pom.xml                                       | 77 ++++++++++++++++++-
 6 files changed, 188 insertions(+), 62 deletions(-)
 create mode 100644 dhp-applications/dhp-is-mapper/pom.xml

diff --git a/dhp-applications/dhp-collector-worker/pom.xml b/dhp-applications/dhp-collector-worker/pom.xml
index ac4d4437b4..07008b56f0 100644
--- a/dhp-applications/dhp-collector-worker/pom.xml
+++ b/dhp-applications/dhp-collector-worker/pom.xml
@@ -80,71 +80,36 @@
     </build>
 
     <dependencies>
-		<dependency>
-			<groupId>eu.dnetlib.dhp</groupId>
-			<artifactId>dhp-common</artifactId>
-		</dependency>
 
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
-            <version>1.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-client</artifactId>
-            <version>2.6.0-cdh5.9.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.9.8</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.9.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.8</version>
         </dependency>
         <dependency>
             <groupId>jaxen</groupId>
             <artifactId>jaxen</artifactId>
-            <version>1.1.6</version>
         </dependency>
         <dependency>
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
-            <version>1.6.1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.9.8</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
         </dependency>
 
+
     </dependencies>
-
-
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <dhp.cdh.version>cdh5.9.2</dhp.cdh.version>
-        <dhp.hadoop.version>2.6.0-${dhp.cdh.version}</dhp.hadoop.version>
-        <dhp.spark.version>2.2.0</dhp.spark.version>
-        <scala.version>2.11.8</scala.version>
-    </properties>
-
-
 </project>
\ No newline at end of file
diff --git a/dhp-applications/dhp-is-mapper/pom.xml b/dhp-applications/dhp-is-mapper/pom.xml
new file mode 100644
index 0000000000..b30e84a38e
--- /dev/null
+++ b/dhp-applications/dhp-is-mapper/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>dhp-applications</artifactId>
+        <groupId>eu.dnetlib.dhp</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dhp-is-mapper</artifactId>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.spark</groupId>
+            <artifactId>spark-core_2.11</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.spark</groupId>
+            <artifactId>spark-sql_2.11</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>eu.dnetlib.dhp</groupId>
+            <artifactId>dhp-common</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>eu.dnetlib.dhp</groupId>
+            <artifactId>dhp-schemas</artifactId>
+        </dependency>
+
+
+    </dependencies>
+
+
+</project>
\ No newline at end of file
diff --git a/dhp-applications/pom.xml b/dhp-applications/pom.xml
index 30f972ccd2..12b0b9aded 100644
--- a/dhp-applications/pom.xml
+++ b/dhp-applications/pom.xml
@@ -10,28 +10,23 @@
     </parent>
     <artifactId>dhp-applications</artifactId>
     <packaging>pom</packaging>
+
     <modules>
         <module>dhp-collector-worker</module>
+        <module>dhp-is-mapper</module>
     </modules>
 
 
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>eu.dnetlib.dhp</groupId>
-                <artifactId>dhp-common</artifactId>
-                <version>1.0.0-SNAPSHOT</version>
-            </dependency>
 
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-core</artifactId>
-                <version>2.7.22</version>
-                <scope>test</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>eu.dnetlib.dhp</groupId>
+            <artifactId>dhp-common</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
 
 
 </project>
diff --git a/dhp-common/pom.xml b/dhp-common/pom.xml
index 42acacb8a6..d2aa039269 100644
--- a/dhp-common/pom.xml
+++ b/dhp-common/pom.xml
@@ -18,7 +18,6 @@
 		<dependency>
 			<groupId>commons-cli</groupId>
 			<artifactId>commons-cli</artifactId>
-			<version>1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -31,29 +30,21 @@
 		<dependency>
 			<groupId>javax.persistence</groupId>
 			<artifactId>javax.persistence-api</artifactId>
-			<version>2.2</version>
-			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.6.5</version>
-			<scope>provided</scope>
-
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/com.rabbitmq/amqp-client -->
 		<dependency>
 			<groupId>com.rabbitmq</groupId>
 			<artifactId>amqp-client</artifactId>
-			<version>5.6.0</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.4</version>
-			<scope>test</scope>
 		</dependency>
 	</dependencies>
 
diff --git a/dhp-schemas/pom.xml b/dhp-schemas/pom.xml
index 5c5b804a7c..6ba9dead75 100644
--- a/dhp-schemas/pom.xml
+++ b/dhp-schemas/pom.xml
@@ -14,8 +14,70 @@
     <artifactId>dhp-schemas</artifactId>
     <packaging>jar</packaging>
 
+    <pluginRepositories>
+        <pluginRepository>
+            <id>dnet-plugin</id>
+            <name>dnet plugin repository</name>
+            <url>http://maven.research-infrastructures.eu/nexus/content/repositories/dnet4-bootstrap-release</url>
+            <layout>default</layout>
+        </pluginRepository>
+    </pluginRepositories>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>eu.dnetlib</groupId>
+                <artifactId>protoc-jar-maven-plugin</artifactId>
+                <version>1.1.0</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <protocVersion>${google.protobuf.version}</protocVersion>
+                            <inputDirectories>
+                                <include>src/main/resources</include>
+                            </inputDirectories>
+                            <outputDirectory>src/gen/java</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.protobuf-java-format</groupId>
+            <artifactId>protobuf-java-format</artifactId>
+            <version>1.2</version>
+
+        </dependency>
+
+    </dependencies>
 
 
 </project>
diff --git a/pom.xml b/pom.xml
index 04fc87611c..f426b333eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,9 +21,10 @@
 
     <modules>
         <module>dhp-build</module>
+        <module>dhp-schemas</module>
         <module>dhp-common</module>
         <module>dhp-workflows</module>
-	    <module>dhp-applications</module>
+        <module>dhp-applications</module>
     </modules>
 
     <issueManagement>
@@ -115,6 +116,12 @@
                 <version>${dhp.hadoop.version}</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>org.apache.hadoop</groupId>
+                <artifactId>hadoop-client</artifactId>
+                <version>${dhp.hadoop.version}</version>
+                <scope>provided</scope>
+            </dependency>
             <dependency>
                 <groupId>org.apache.spark</groupId>
                 <artifactId>spark-core_2.11</artifactId>
@@ -140,6 +147,12 @@
                 <version>1.9</version>
             </dependency>
 
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.4</version>
+            </dependency>
+
             <dependency>
                 <groupId>commons-cli</groupId>
                 <artifactId>commons-cli</artifactId>
@@ -177,6 +190,38 @@
                 <scope>test</scope>
             </dependency>
 
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${dhp.jackson.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-annotations</artifactId>
+                <version>${dhp.jackson.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${dhp.jackson.version}</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>javax.persistence</groupId>
+                <artifactId>javax.persistence-api</artifactId>
+                <version>2.2</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>com.rabbitmq</groupId>
+                <artifactId>amqp-client</artifactId>
+                <version>5.6.0</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.oozie</groupId>
                 <artifactId>oozie-client</artifactId>
@@ -191,6 +236,12 @@
                 </exclusions>
             </dependency>
 
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java</artifactId>
+                <version>${google.protobuf.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -233,6 +284,27 @@
                     </executions>
                 </plugin>
 
+                <plugin>
+                    <groupId>eu.dnetlib</groupId>
+                    <artifactId>protoc-jar-maven-plugin</artifactId>
+                    <version>1.1.0</version>
+                    <executions>
+                        <execution>
+                            <phase>generate-sources</phase>
+                            <goals>
+                                <goal>run</goal>
+                            </goals>
+                            <configuration>
+                                <protocVersion>${google.protobuf.version}</protocVersion>
+                                <inputDirectories>
+                                    <include>src/main/resources</include>
+                                </inputDirectories>
+                                <outputDirectory>src/gen/java</outputDirectory>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
@@ -368,9 +440,10 @@
         <dhp.hadoop.version>2.6.0-${dhp.cdh.version}</dhp.hadoop.version>
         <dhp.oozie.version>4.1.0-${dhp.cdh.version}</dhp.oozie.version>
         <dhp.spark.version>2.2.0</dhp.spark.version>
-
+        <dhp.jackson.version>2.6.5</dhp.jackson.version>
         <dhp.commons.lang.version>3.5</dhp.commons.lang.version>
         <scala.version>2.11.8</scala.version>
+        <google.protobuf.version>2.4.1</google.protobuf.version>
     </properties>
 </project>