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

dhp-workflows/dhp-aggregation/src/main/scala/eu/dnetlib/dhp/datacite/AbstractRestClient.scala

@@ -49,7 +49,7 @@ abstract class AbstractRestClient extends Iterator[String] {
   }
 
   private def doHTTPRequest[A <: HttpUriRequest](r: A): String = {
-    val timeout = 60; // seconds
+    val timeout = 600; // seconds
     val config = RequestConfig
       .custom()
       .setConnectTimeout(timeout * 1000)

dhp-workflows/dhp-aggregation/src/main/scala/eu/dnetlib/dhp/datacite/ImportDatacite.scala

@@ -46,7 +46,7 @@ object ImportDatacite {
       Source
         .fromInputStream(
           getClass.getResourceAsStream(
-            "/eu/dnetlib/dhp/actionmanager/datacite/import_from_api.json"
+            "/eu/dnetlib/dhp/datacite/import_from_api.json"
           )
         )
         .mkString