From e1c69ad24e0324f70f946e7e21a31a378508d166 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 11:23:57 +0100 Subject: [PATCH 01/10] [maven-release-plugin] prepare release dnet-dedup-3.0.1 --- dnet-pace-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index 51958c50c..b0ba26979 100644 --- a/dnet-pace-core/pom.xml +++ b/dnet-pace-core/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib dnet-dedup - 3.0.1-SNAPSHOT + 3.0.1 ../pom.xml From 46cee13596cd9987757a1ab7bc7c64a6e9798808 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 11:24:06 +0100 Subject: [PATCH 02/10] [maven-release-plugin] prepare for next development iteration --- dnet-pace-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index b0ba26979..2d07fb290 100644 --- a/dnet-pace-core/pom.xml +++ b/dnet-pace-core/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib dnet-dedup - 3.0.1 + 3.0.2-SNAPSHOT ../pom.xml From 6d0904128886e56afe71ce0ea040dbdca9af8a8b Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 11:28:28 +0100 Subject: [PATCH 03/10] [maven-release-plugin] rollback the release of dnet-dedup-3.0.1 --- dnet-pace-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index 2d07fb290..51958c50c 100644 --- a/dnet-pace-core/pom.xml +++ b/dnet-pace-core/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib dnet-dedup - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT ../pom.xml From f283d58a6edc9ab5b94b5963be898e0f95f99694 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 11:38:52 +0100 Subject: [PATCH 04/10] [maven-release-plugin] prepare release dnet-dedup-3.0.1 --- dnet-pace-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index 51958c50c..b0ba26979 100644 --- a/dnet-pace-core/pom.xml +++ b/dnet-pace-core/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib dnet-dedup - 3.0.1-SNAPSHOT + 3.0.1 ../pom.xml From 851ae5eec32064257adc428ba4fee5fd43816587 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 11:39:07 +0100 Subject: [PATCH 05/10] [maven-release-plugin] rollback the release of dnet-dedup-3.0.1 --- dnet-pace-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index b0ba26979..51958c50c 100644 --- a/dnet-pace-core/pom.xml +++ b/dnet-pace-core/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib dnet-dedup - 3.0.1 + 3.0.1-SNAPSHOT ../pom.xml From 8cc2517f5da29e397119a9ab2922f0795a855c72 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 11:40:34 +0100 Subject: [PATCH 06/10] [maven-release-plugin] prepare release dnet-dedup-3.0.1 --- dnet-pace-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index 51958c50c..b0ba26979 100644 --- a/dnet-pace-core/pom.xml +++ b/dnet-pace-core/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib dnet-dedup - 3.0.1-SNAPSHOT + 3.0.1 ../pom.xml From 3dacba37ea5a50b11e1a0e6ad8f6b23d767ea519 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 11:40:42 +0100 Subject: [PATCH 07/10] [maven-release-plugin] prepare for next development iteration --- dnet-pace-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index b0ba26979..2d07fb290 100644 --- a/dnet-pace-core/pom.xml +++ b/dnet-pace-core/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib dnet-dedup - 3.0.1 + 3.0.2-SNAPSHOT ../pom.xml From b7bc7f0401cc5b28ebf7f4ed702beb9432721580 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 12:46:06 +0100 Subject: [PATCH 08/10] getting rid of spark libs from dnet-pace-core --- dnet-pace-core/pom.xml | 11 ++++++++-- .../pace/common/AbstractPaceFunctions.java | 22 ++++++++----------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index 2d07fb290..dfe97056b 100644 --- a/dnet-pace-core/pom.xml +++ b/dnet-pace-core/pom.xml @@ -59,10 +59,17 @@ org.reflections reflections + - org.apache.spark - spark-core_2.11 + com.fasterxml.jackson.core + jackson-databind + + org.codehaus.jackson + jackson-mapper-asl + + + diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/common/AbstractPaceFunctions.java b/dnet-pace-core/src/main/java/eu/dnetlib/pace/common/AbstractPaceFunctions.java index 9fa67d7c1..d07b1974f 100644 --- a/dnet-pace-core/src/main/java/eu/dnetlib/pace/common/AbstractPaceFunctions.java +++ b/dnet-pace-core/src/main/java/eu/dnetlib/pace/common/AbstractPaceFunctions.java @@ -1,26 +1,22 @@ package eu.dnetlib.pace.common; -import java.text.Normalizer; -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import com.google.common.collect.Maps; -import eu.dnetlib.pace.distance.algo.JaroWinklerNormalizedName; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; - import com.google.common.base.Joiner; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; - import eu.dnetlib.pace.clustering.NGramUtils; +import eu.dnetlib.pace.distance.algo.JaroWinklerNormalizedName; import eu.dnetlib.pace.model.Field; import eu.dnetlib.pace.model.FieldList; import eu.dnetlib.pace.model.FieldListImpl; -import org.apache.spark.util.CollectionsUtils; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; + +import java.text.Normalizer; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * Set of common functions From e247218987646255dc1cc4311d8a55df8d9c8ab9 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 12:46:42 +0100 Subject: [PATCH 09/10] [maven-release-plugin] prepare release dnet-dedup-3.0.2 --- dnet-pace-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index dfe97056b..066306d53 100644 --- a/dnet-pace-core/pom.xml +++ b/dnet-pace-core/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib dnet-dedup - 3.0.2-SNAPSHOT + 3.0.2 ../pom.xml From 2a509b18fa6b907b708ad0b3ed9adc81502256be Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 12:46:50 +0100 Subject: [PATCH 10/10] [maven-release-plugin] prepare for next development iteration --- dnet-pace-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index 066306d53..d0b4a150a 100644 --- a/dnet-pace-core/pom.xml +++ b/dnet-pace-core/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib dnet-dedup - 3.0.2 + 3.0.3-SNAPSHOT ../pom.xml