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

.gitignore

@@ -14,7 +14,6 @@
 /*/.metadata
 /*/*/.metadata
 .project
-.log
 .settings
 /*/*/target
 /*/target
@@ -24,4 +23,5 @@
 /build
 spark-warehouse
 /**/job-override.properties
+/**/*.log
 

dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/SparkGraphImporterJobTest.java

@@ -18,7 +18,7 @@ public class SparkGraphImporterJobTest {
 
             new SparkGraphImporterJob().runWith(
                     spark,
-                    getClass().getResource("/eu/dnetlib/dhp/graph/sample").getPath(),
+                    getClass().getResource("/eu/dnetlib/dhp/oa/graph/sample").getPath(),
                     TEST_DB_NAME);
 
             GraphMappingUtils.types.forEach((name, clazz) -> {