From b54f4eabe7dadd912f1a6fa55a2ab43d3a0c813b Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Fri, 20 Oct 2023 14:33:03 +0200 Subject: [PATCH 1/4] return the base instance when merging an empty enrichment --- pom.xml | 2 +- src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c70a6f3..adeb4a0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib.dhp dhp-schemas jar - 3.17.2-SNAPSHOT + 3.17.2-fixInstance-SNAPSHOT diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java index 9ea7801..ba253c0 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java @@ -706,7 +706,7 @@ public class Result extends OafEntity implements Serializable { return enrichmentResult; } if (enrichmentInstances == null) { - return enrichmentResult; + return toEnrichInstances; } Map ri = toInstanceMap(enrichmentInstances); From efe30b16370af6bd3c46427e174e72eb2a0dd538 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Fri, 20 Oct 2023 22:23:54 +0200 Subject: [PATCH 2/4] pom version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index adeb4a0..c70a6f3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib.dhp dhp-schemas jar - 3.17.2-fixInstance-SNAPSHOT + 3.17.2-SNAPSHOT From 3ccee68e0e2ff927849819bbc30b724c33542899 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Fri, 20 Oct 2023 22:25:25 +0200 Subject: [PATCH 3/4] [maven-release-plugin] prepare release dhp-schemas-3.17.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c70a6f3..5780566 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib.dhp dhp-schemas jar - 3.17.2-SNAPSHOT + 3.17.2 @@ -32,7 +32,7 @@ scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git https://code-repo.d4science.org/D-Net/dhp-schemas/ - dhp-schemas-2.10.30 + dhp-schemas-3.17.2 This module contains common schema classes meant to be used across the dnet-hadoop submodules From 58fd156d5dc271b3315f17ca2e07688f62d880a9 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Fri, 20 Oct 2023 22:25:29 +0200 Subject: [PATCH 4/4] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5780566..93b3207 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib.dhp dhp-schemas jar - 3.17.2 + 3.17.3-SNAPSHOT @@ -32,7 +32,7 @@ scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git https://code-repo.d4science.org/D-Net/dhp-schemas/ - dhp-schemas-3.17.2 + dhp-schemas-2.10.30 This module contains common schema classes meant to be used across the dnet-hadoop submodules