diff --git a/dhp-build/dhp-build-assembly-resources/pom.xml b/dhp-build/dhp-build-assembly-resources/pom.xml
index 012ff89a3..44165995d 100644
--- a/dhp-build/dhp-build-assembly-resources/pom.xml
+++ b/dhp-build/dhp-build-assembly-resources/pom.xml
@@ -6,7 +6,7 @@
eu.dnetlib.dhp
dhp-build
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
dhp-build-assembly-resources
diff --git a/dhp-build/dhp-build-properties-maven-plugin/pom.xml b/dhp-build/dhp-build-properties-maven-plugin/pom.xml
index 256017e2c..7579bdf45 100644
--- a/dhp-build/dhp-build-properties-maven-plugin/pom.xml
+++ b/dhp-build/dhp-build-properties-maven-plugin/pom.xml
@@ -6,7 +6,7 @@
eu.dnetlib.dhp
dhp-build
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
dhp-build-properties-maven-plugin
diff --git a/dhp-build/dhp-code-style/pom.xml b/dhp-build/dhp-code-style/pom.xml
index db0097d64..5a86efe17 100644
--- a/dhp-build/dhp-code-style/pom.xml
+++ b/dhp-build/dhp-code-style/pom.xml
@@ -5,7 +5,7 @@
eu.dnetlib.dhp
dhp-code-style
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
jar
@@ -47,12 +47,16 @@
org.apache.maven.plugins
maven-site-plugin
3.9.1
+
+ true
+
+
UTF-8
sftp://dnet-hadoop@static-web.d4science.org/dnet-hadoop
diff --git a/dhp-build/pom.xml b/dhp-build/pom.xml
index 97fbdf45b..9040ea94e 100644
--- a/dhp-build/pom.xml
+++ b/dhp-build/pom.xml
@@ -4,7 +4,7 @@
eu.dnetlib.dhp
dhp
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
dhp-build
pom
diff --git a/dhp-common/pom.xml b/dhp-common/pom.xml
index 7b18f0105..6df11f4ea 100644
--- a/dhp-common/pom.xml
+++ b/dhp-common/pom.xml
@@ -5,7 +5,7 @@
eu.dnetlib.dhp
dhp
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
../pom.xml
diff --git a/dhp-workflows/dhp-actionmanager/pom.xml b/dhp-workflows/dhp-actionmanager/pom.xml
index f63f3aa01..29e1fab1f 100644
--- a/dhp-workflows/dhp-actionmanager/pom.xml
+++ b/dhp-workflows/dhp-actionmanager/pom.xml
@@ -4,7 +4,7 @@
eu.dnetlib.dhp
dhp-workflows
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
dhp-actionmanager
diff --git a/dhp-workflows/dhp-aggregation/pom.xml b/dhp-workflows/dhp-aggregation/pom.xml
index c89cc9d1d..53d349d2a 100644
--- a/dhp-workflows/dhp-aggregation/pom.xml
+++ b/dhp-workflows/dhp-aggregation/pom.xml
@@ -4,7 +4,7 @@
eu.dnetlib.dhp
dhp-workflows
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
dhp-aggregation
diff --git a/dhp-workflows/dhp-blacklist/pom.xml b/dhp-workflows/dhp-blacklist/pom.xml
index 047767d33..479a9e8c6 100644
--- a/dhp-workflows/dhp-blacklist/pom.xml
+++ b/dhp-workflows/dhp-blacklist/pom.xml
@@ -3,7 +3,7 @@
dhp-workflows
eu.dnetlib.dhp
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
4.0.0
diff --git a/dhp-workflows/dhp-broker-events/pom.xml b/dhp-workflows/dhp-broker-events/pom.xml
index afbd93dcb..5a41a0090 100644
--- a/dhp-workflows/dhp-broker-events/pom.xml
+++ b/dhp-workflows/dhp-broker-events/pom.xml
@@ -1,11 +1,9 @@
-
+
dhp-workflows
eu.dnetlib.dhp
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
4.0.0
diff --git a/dhp-workflows/dhp-dedup-openaire/pom.xml b/dhp-workflows/dhp-dedup-openaire/pom.xml
index f47f8ba6e..a14076a78 100644
--- a/dhp-workflows/dhp-dedup-openaire/pom.xml
+++ b/dhp-workflows/dhp-dedup-openaire/pom.xml
@@ -3,7 +3,7 @@
dhp-workflows
eu.dnetlib.dhp
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
4.0.0
dhp-dedup-openaire
diff --git a/dhp-workflows/dhp-distcp/pom.xml b/dhp-workflows/dhp-distcp/pom.xml
index 8c10538c0..c3d3a7375 100644
--- a/dhp-workflows/dhp-distcp/pom.xml
+++ b/dhp-workflows/dhp-distcp/pom.xml
@@ -3,7 +3,7 @@
dhp-workflows
eu.dnetlib.dhp
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
4.0.0
diff --git a/dhp-workflows/dhp-doiboost/pom.xml b/dhp-workflows/dhp-doiboost/pom.xml
index f496ea9a2..37accbc4f 100644
--- a/dhp-workflows/dhp-doiboost/pom.xml
+++ b/dhp-workflows/dhp-doiboost/pom.xml
@@ -3,7 +3,7 @@
dhp-workflows
eu.dnetlib.dhp
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
4.0.0
diff --git a/dhp-workflows/dhp-doiboost/src/main/scala/eu/dnetlib/doiboost/crossref/Crossref2Oaf.scala b/dhp-workflows/dhp-doiboost/src/main/scala/eu/dnetlib/doiboost/crossref/Crossref2Oaf.scala
index 0cb08ea94..b4d6d67e2 100644
--- a/dhp-workflows/dhp-doiboost/src/main/scala/eu/dnetlib/doiboost/crossref/Crossref2Oaf.scala
+++ b/dhp-workflows/dhp-doiboost/src/main/scala/eu/dnetlib/doiboost/crossref/Crossref2Oaf.scala
@@ -446,16 +446,12 @@ case object Crossref2Oaf {
case "10.13039/501100000781" =>
generateSimpleRelationFromAward(funder, "corda_______", extractECAward)
generateSimpleRelationFromAward(funder, "corda__h2020", extractECAward)
- case "10.13039/100000001" =>
- generateSimpleRelationFromAward(funder, "nsf_________", a => a)
- case "10.13039/501100001665" =>
- generateSimpleRelationFromAward(funder, "anr_________", a => a)
- case "10.13039/501100002341" =>
- generateSimpleRelationFromAward(funder, "aka_________", a => a)
+ case "10.13039/100000001" => generateSimpleRelationFromAward(funder, "nsf_________", a => a)
+ case "10.13039/501100001665" => generateSimpleRelationFromAward(funder, "anr_________", a => a)
+ case "10.13039/501100002341" => generateSimpleRelationFromAward(funder, "aka_________", a => a)
case "10.13039/501100001602" =>
- generateSimpleRelationFromAward(funder, "aka_________", a => a.replace("SFI", ""))
- case "10.13039/501100000923" =>
- generateSimpleRelationFromAward(funder, "arc_________", a => a)
+ generateSimpleRelationFromAward(funder, "sfi_________", a => a.replace("SFI", ""))
+ case "10.13039/501100000923" => generateSimpleRelationFromAward(funder, "arc_________", a => a)
case "10.13039/501100000038" =>
val targetId = getProjectId("nserc_______", "1e5e62235d094afd01cd56e65112fc63")
queue += generateRelation(sourceId, targetId, ModelConstants.IS_PRODUCED_BY)
@@ -468,14 +464,10 @@ case object Crossref2Oaf {
val targetId = getProjectId("cihr________", "1e5e62235d094afd01cd56e65112fc63")
queue += generateRelation(sourceId, targetId, ModelConstants.IS_PRODUCED_BY)
queue += generateRelation(targetId, sourceId, ModelConstants.PRODUCES)
- case "10.13039/501100002848" =>
- generateSimpleRelationFromAward(funder, "conicytf____", a => a)
- case "10.13039/501100003448" =>
- generateSimpleRelationFromAward(funder, "gsrt________", extractECAward)
- case "10.13039/501100010198" =>
- generateSimpleRelationFromAward(funder, "sgov________", a => a)
- case "10.13039/501100004564" =>
- generateSimpleRelationFromAward(funder, "mestd_______", extractECAward)
+ case "10.13039/501100002848" => generateSimpleRelationFromAward(funder, "conicytf____", a => a)
+ case "10.13039/501100003448" => generateSimpleRelationFromAward(funder, "gsrt________", extractECAward)
+ case "10.13039/501100010198" => generateSimpleRelationFromAward(funder, "sgov________", a => a)
+ case "10.13039/501100004564" => generateSimpleRelationFromAward(funder, "mestd_______", extractECAward)
case "10.13039/501100003407" =>
generateSimpleRelationFromAward(funder, "miur________", a => a)
val targetId = getProjectId("miur________", "1e5e62235d094afd01cd56e65112fc63")
@@ -487,15 +479,11 @@ case object Crossref2Oaf {
"irb_hr______",
a => a.replaceAll("Project No.", "").replaceAll("HRZZ-", "")
)
- case "10.13039/501100006769" =>
- generateSimpleRelationFromAward(funder, "rsf_________", a => a)
- case "10.13039/501100001711" =>
- generateSimpleRelationFromAward(funder, "snsf________", snsfRule)
- case "10.13039/501100004410" =>
- generateSimpleRelationFromAward(funder, "tubitakf____", a => a)
- case "10.10.13039/100004440" =>
- generateSimpleRelationFromAward(funder, "wt__________", a => a)
+ case "10.13039/501100006769" => generateSimpleRelationFromAward(funder, "rsf_________", a => a)
+ case "10.13039/501100001711" => generateSimpleRelationFromAward(funder, "snsf________", snsfRule)
+ case "10.13039/501100004410" => generateSimpleRelationFromAward(funder, "tubitakf____", a => a)
case "10.13039/100004440" =>
+ generateSimpleRelationFromAward(funder, "wt__________", a => a)
val targetId = getProjectId("wt__________", "1e5e62235d094afd01cd56e65112fc63")
queue += generateRelation(sourceId, targetId, ModelConstants.IS_PRODUCED_BY)
queue += generateRelation(targetId, sourceId, ModelConstants.PRODUCES)
@@ -516,6 +504,7 @@ case object Crossref2Oaf {
case "CONICYT, Programa de FormaciĆ³n de Capital Humano Avanzado" =>
generateSimpleRelationFromAward(funder, "conicytf____", extractECAward)
case "Wellcome Trust Masters Fellowship" =>
+ generateSimpleRelationFromAward(funder, "wt__________", a => a)
val targetId = getProjectId("wt__________", "1e5e62235d094afd01cd56e65112fc63")
queue += generateRelation(sourceId, targetId, ModelConstants.IS_PRODUCED_BY)
queue += generateRelation(targetId, sourceId, ModelConstants.PRODUCES)
diff --git a/dhp-workflows/dhp-enrichment/pom.xml b/dhp-workflows/dhp-enrichment/pom.xml
index 0b4269acd..591cad252 100644
--- a/dhp-workflows/dhp-enrichment/pom.xml
+++ b/dhp-workflows/dhp-enrichment/pom.xml
@@ -3,7 +3,7 @@
dhp-workflows
eu.dnetlib.dhp
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
4.0.0
@@ -51,7 +51,7 @@
eu.dnetlib.dhp
dhp-aggregation
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
compile
diff --git a/dhp-workflows/dhp-enrichment/src/main/resources/eu/dnetlib/dhp/countrypropagation/oozie_app/workflow.xml b/dhp-workflows/dhp-enrichment/src/main/resources/eu/dnetlib/dhp/countrypropagation/oozie_app/workflow.xml
index 202c86a6d..271ccbf72 100644
--- a/dhp-workflows/dhp-enrichment/src/main/resources/eu/dnetlib/dhp/countrypropagation/oozie_app/workflow.xml
+++ b/dhp-workflows/dhp-enrichment/src/main/resources/eu/dnetlib/dhp/countrypropagation/oozie_app/workflow.xml
@@ -274,7 +274,6 @@
--sourcePath${sourcePath}/publication
--preparedInfoPath${workingDir}/publication
- --saveGraph${saveGraph}
--resultTableNameeu.dnetlib.dhp.schema.oaf.Publication
--outputPath${outputPath}/publication
@@ -304,7 +303,6 @@
--sourcePath${sourcePath}/dataset
--preparedInfoPath${workingDir}/dataset
- --saveGraph${saveGraph}
--resultTableNameeu.dnetlib.dhp.schema.oaf.Dataset
--outputPath${outputPath}/dataset
@@ -334,7 +332,6 @@
--sourcePath${sourcePath}/otherresearchproduct
--preparedInfoPath${workingDir}/otherresearchproduct
- --saveGraph${saveGraph}
--resultTableNameeu.dnetlib.dhp.schema.oaf.OtherResearchProduct
--outputPath${outputPath}/otherresearchproduct
@@ -364,7 +361,6 @@
--sourcePath${sourcePath}/software
--preparedInfoPath${workingDir}/software
- --saveGraph${saveGraph}
--resultTableNameeu.dnetlib.dhp.schema.oaf.Software
--outputPath${outputPath}/software
diff --git a/dhp-workflows/dhp-graph-mapper/pom.xml b/dhp-workflows/dhp-graph-mapper/pom.xml
index 19febb9ed..4eaa5cc0d 100644
--- a/dhp-workflows/dhp-graph-mapper/pom.xml
+++ b/dhp-workflows/dhp-graph-mapper/pom.xml
@@ -3,7 +3,7 @@
dhp-workflows
eu.dnetlib.dhp
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
4.0.0
diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java
index 1f8c23ac3..b5801ca5c 100644
--- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java
+++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/MigrateDbEntitiesApplication.java
@@ -42,10 +42,7 @@ import java.io.IOException;
import java.sql.Array;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Predicate;
@@ -311,7 +308,13 @@ public class MigrateDbEntitiesApplication extends AbstractMigrationApplication i
ds.setContentpolicies(prepareListOfQualifiers(rs.getArray("contentpolicies")));
ds.setConsenttermsofuse(rs.getBoolean("consenttermsofuse"));
ds.setFulltextdownload(rs.getBoolean("fulltextdownload"));
- ds.setConsenttermsofusedate(rs.getDate("consenttermsofusedate").toString());
+ ds
+ .setConsenttermsofusedate(
+ Optional
+ .ofNullable(
+ rs.getDate("consenttermsofusedate"))
+ .map(c -> c.toString())
+ .orElse(null));
return Arrays.asList(ds);
} catch (final Exception e) {
diff --git a/dhp-workflows/dhp-graph-provision/pom.xml b/dhp-workflows/dhp-graph-provision/pom.xml
index e402d0600..ae8f3b53a 100644
--- a/dhp-workflows/dhp-graph-provision/pom.xml
+++ b/dhp-workflows/dhp-graph-provision/pom.xml
@@ -3,7 +3,7 @@
dhp-workflows
eu.dnetlib.dhp
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
4.0.0
diff --git a/dhp-workflows/dhp-stats-promote/pom.xml b/dhp-workflows/dhp-stats-promote/pom.xml
index c64c2f58e..ce3e739a5 100644
--- a/dhp-workflows/dhp-stats-promote/pom.xml
+++ b/dhp-workflows/dhp-stats-promote/pom.xml
@@ -3,7 +3,7 @@
dhp-workflows
eu.dnetlib.dhp
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
4.0.0
dhp-stats-promote
diff --git a/dhp-workflows/dhp-stats-update/pom.xml b/dhp-workflows/dhp-stats-update/pom.xml
index 52f35ff07..2bc610c42 100644
--- a/dhp-workflows/dhp-stats-update/pom.xml
+++ b/dhp-workflows/dhp-stats-update/pom.xml
@@ -3,7 +3,7 @@
dhp-workflows
eu.dnetlib.dhp
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
4.0.0
dhp-stats-update
diff --git a/dhp-workflows/dhp-usage-raw-data-update/pom.xml b/dhp-workflows/dhp-usage-raw-data-update/pom.xml
index a78f92d41..954c8bd39 100644
--- a/dhp-workflows/dhp-usage-raw-data-update/pom.xml
+++ b/dhp-workflows/dhp-usage-raw-data-update/pom.xml
@@ -3,7 +3,7 @@
dhp-workflows
eu.dnetlib.dhp
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
4.0.0
dhp-usage-raw-data-update
diff --git a/dhp-workflows/dhp-usage-stats-build/pom.xml b/dhp-workflows/dhp-usage-stats-build/pom.xml
index 20d2f5b76..54e18580b 100644
--- a/dhp-workflows/dhp-usage-stats-build/pom.xml
+++ b/dhp-workflows/dhp-usage-stats-build/pom.xml
@@ -3,7 +3,7 @@
dhp-workflows
eu.dnetlib.dhp
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
4.0.0
dhp-usage-stats-build
diff --git a/dhp-workflows/dhp-workflow-profiles/pom.xml b/dhp-workflows/dhp-workflow-profiles/pom.xml
index b1c51c497..8c71a5ca1 100644
--- a/dhp-workflows/dhp-workflow-profiles/pom.xml
+++ b/dhp-workflows/dhp-workflow-profiles/pom.xml
@@ -3,7 +3,7 @@
dhp-workflows
eu.dnetlib.dhp
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
4.0.0
diff --git a/dhp-workflows/pom.xml b/dhp-workflows/pom.xml
index 143178560..541d59007 100644
--- a/dhp-workflows/pom.xml
+++ b/dhp-workflows/pom.xml
@@ -6,7 +6,7 @@
eu.dnetlib.dhp
dhp
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
../pom.xml
diff --git a/pom.xml b/pom.xml
index 6a14954e5..136b9b867 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
eu.dnetlib.dhp
dhp
- 1.2.4-SNAPSHOT
+ 1.2.5-SNAPSHOT
pom
@@ -551,6 +551,9 @@
org.apache.maven.plugins
maven-site-plugin
3.9.1
+
+ ${dhp.site.skip}
+
@@ -791,6 +794,7 @@
2.4.0.cloudera2
2.9.6
3.5
+ true
11.0.2
2.11.12
5.6.1