Merge branch 'master' of code-repo.d4science.org:D-Net/dnet-hadoop

dhp-workflows/dhp-dedup-openaire/pom.xml

@@ -7,7 +7,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>dhp-dedup</artifactId>
+    <artifactId>dhp-dedup-openaire</artifactId>
     
     <build>
     	<plugins>

dhp-workflows/dhp-dedup-openaire/src/main/resources/eu/dnetlib/dhp/dedup/consistency/oozie_app/workflow.xml

@@ -56,7 +56,7 @@
             <mode>cluster</mode>
             <name>Update Entity</name>
             <class>eu.dnetlib.dhp.dedup.SparkUpdateEntity</class>
-            <jar>dhp-dedup-${projectVersion}.jar</jar>
+            <jar>dhp-dedup-openaire-${projectVersion}.jar</jar>
             <spark-opts>
                 --executor-memory ${sparkExecutorMemory}
                 --executor-cores ${sparkExecutorCores}
@@ -83,7 +83,7 @@
             <mode>cluster</mode>
             <name>Update Relations</name>
             <class>eu.dnetlib.dhp.dedup.SparkPropagateRelation</class>
-            <jar>dhp-dedup-${projectVersion}.jar</jar>
+            <jar>dhp-dedup-openaire-${projectVersion}.jar</jar>
             <spark-opts>
                 --executor-memory ${sparkExecutorMemory}
                 --executor-cores ${sparkExecutorCores}

dhp-workflows/dhp-dedup-openaire/src/main/resources/eu/dnetlib/dhp/dedup/scan/oozie_app/workflow.xml

@@ -60,7 +60,7 @@
             <mode>cluster</mode>
             <name>Create Similarity Relations</name>
             <class>eu.dnetlib.dhp.dedup.SparkCreateSimRels</class>
-            <jar>dhp-dedup-${projectVersion}.jar</jar>
+            <jar>dhp-dedup-openaire-${projectVersion}.jar</jar>
             <spark-opts>
                 --executor-memory ${sparkExecutorMemory}
                 --executor-cores ${sparkExecutorCores}
@@ -87,7 +87,7 @@
             <mode>cluster</mode>
             <name>Create Merge Relations</name>
             <class>eu.dnetlib.dhp.dedup.SparkCreateConnectedComponent</class>
-            <jar>dhp-dedup-${projectVersion}.jar</jar>
+            <jar>dhp-dedup-openaire-${projectVersion}.jar</jar>
             <spark-opts>
                 --executor-memory ${sparkExecutorMemory}
                 --executor-cores ${sparkExecutorCores}
@@ -115,7 +115,7 @@
             <mode>cluster</mode>
             <name>Create Dedup Record</name>
             <class>eu.dnetlib.dhp.dedup.SparkCreateDedupRecord</class>
-            <jar>dhp-dedup-${projectVersion}.jar</jar>
+            <jar>dhp-dedup-openaire-${projectVersion}.jar</jar>
             <spark-opts>
                 --executor-memory ${sparkExecutorMemory}
                 --executor-cores ${sparkExecutorCores}

dhp-workflows/dhp-dedup-openaire/src/test/java/eu/dnetlib/dhp/dedup/jpath/JsonPathTest.java

@@ -1,15 +1,9 @@
 package eu.dnetlib.dhp.dedup.jpath;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jayway.jsonpath.JsonPath;
 import eu.dnetlib.pace.config.DedupConfig;
 import eu.dnetlib.pace.model.MapDocument;
 import eu.dnetlib.pace.util.MapDocumentUtil;
-import org.apache.commons.io.IOUtils;
 import org.junit.Test;
-import java.util.List;
-import java.util.Map;
 
 public class JsonPathTest {
 

dhp-workflows/pom.xml

@@ -17,7 +17,7 @@
         <module>dhp-aggregation</module>
         <module>dhp-distcp</module>
         <module>dhp-graph-mapper</module>
-        <module>dhp-dedup</module>
+        <module>dhp-dedup-openaire</module>
         <module>dhp-graph-provision</module>
     </modules>