From 4c5f147a186518f93fdf77a64d07c0666980f936 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 11:22:54 +0100 Subject: [PATCH 01/12] updated dependency to dnet-openaireplus-mapping-utils to 6.2.18 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 90f3259..f800fff 100644 --- a/pom.xml +++ b/pom.xml @@ -122,7 +122,7 @@ eu.dnetlib dnet-openaireplus-mapping-utils - 6.2.18-SNAPSHOT + 6.2.18 From 5ec9e552fe66b468cb5e8eedc57374f50a1121ea Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 11:23:57 +0100 Subject: [PATCH 02/12] [maven-release-plugin] prepare release dnet-dedup-3.0.1 --- dnet-dedup-test/pom.xml | 2 +- dnet-pace-core/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dnet-dedup-test/pom.xml b/dnet-dedup-test/pom.xml index 43a7c2b..f5bc508 100644 --- a/dnet-dedup-test/pom.xml +++ b/dnet-dedup-test/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib dnet-dedup - 3.0.1-SNAPSHOT + 3.0.1 ../pom.xml diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index 51958c5..b0ba269 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 diff --git a/pom.xml b/pom.xml index f800fff..2368a91 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib dnet-dedup - 3.0.1-SNAPSHOT + 3.0.1 pom @@ -22,7 +22,7 @@ scm:git:https://github.com/dnet-team/dnet-dedup.git - HEAD + dnet-dedup-3.0.1 From 18944f8b5fa3d81eb33731e469e7a7b976039730 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 11:24:06 +0100 Subject: [PATCH 03/12] [maven-release-plugin] prepare for next development iteration --- dnet-dedup-test/pom.xml | 2 +- dnet-pace-core/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dnet-dedup-test/pom.xml b/dnet-dedup-test/pom.xml index f5bc508..66e2a3d 100644 --- a/dnet-dedup-test/pom.xml +++ b/dnet-dedup-test/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib dnet-dedup - 3.0.1 + 3.0.2-SNAPSHOT ../pom.xml diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index b0ba269..2d07fb2 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 diff --git a/pom.xml b/pom.xml index 2368a91..64daebc 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib dnet-dedup - 3.0.1 + 3.0.2-SNAPSHOT pom @@ -22,7 +22,7 @@ scm:git:https://github.com/dnet-team/dnet-dedup.git - dnet-dedup-3.0.1 + HEAD From 7943d4bb6b12c2273088e5e47f1f04c9617d6abf Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 11:28:28 +0100 Subject: [PATCH 04/12] [maven-release-plugin] rollback the release of dnet-dedup-3.0.1 --- dnet-dedup-test/pom.xml | 2 +- dnet-pace-core/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dnet-dedup-test/pom.xml b/dnet-dedup-test/pom.xml index 66e2a3d..43a7c2b 100644 --- a/dnet-dedup-test/pom.xml +++ b/dnet-dedup-test/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib dnet-dedup - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT ../pom.xml diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index 2d07fb2..51958c5 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 diff --git a/pom.xml b/pom.xml index 64daebc..f800fff 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib dnet-dedup - 3.0.2-SNAPSHOT + 3.0.1-SNAPSHOT pom From 18085fb30b610c9bb2d863a9edc8378dcfd16afd Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 11:35:55 +0100 Subject: [PATCH 05/12] don't break in case of javadoc failure --- pom.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f800fff..3717b9b 100644 --- a/pom.xml +++ b/pom.xml @@ -22,8 +22,8 @@ scm:git:https://github.com/dnet-team/dnet-dedup.git - HEAD - + HEAD + dnet-pace-core @@ -195,5 +195,7 @@ 1.1.3 4.9 + + false From 70f80334d880431df07e7516c8fe107f38d7187e Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 11:38:52 +0100 Subject: [PATCH 06/12] [maven-release-plugin] prepare release dnet-dedup-3.0.1 --- dnet-dedup-test/pom.xml | 2 +- dnet-pace-core/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dnet-dedup-test/pom.xml b/dnet-dedup-test/pom.xml index 43a7c2b..f5bc508 100644 --- a/dnet-dedup-test/pom.xml +++ b/dnet-dedup-test/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib dnet-dedup - 3.0.1-SNAPSHOT + 3.0.1 ../pom.xml diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index 51958c5..b0ba269 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 diff --git a/pom.xml b/pom.xml index 3717b9b..3d07c38 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib dnet-dedup - 3.0.1-SNAPSHOT + 3.0.1 pom @@ -22,7 +22,7 @@ scm:git:https://github.com/dnet-team/dnet-dedup.git - HEAD + dnet-dedup-3.0.1 From d850ba26c1bbae71f29036acb88094d316161981 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 11:39:07 +0100 Subject: [PATCH 07/12] [maven-release-plugin] rollback the release of dnet-dedup-3.0.1 --- dnet-dedup-test/pom.xml | 2 +- dnet-pace-core/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dnet-dedup-test/pom.xml b/dnet-dedup-test/pom.xml index f5bc508..43a7c2b 100644 --- a/dnet-dedup-test/pom.xml +++ b/dnet-dedup-test/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib dnet-dedup - 3.0.1 + 3.0.1-SNAPSHOT ../pom.xml diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index b0ba269..51958c5 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 diff --git a/pom.xml b/pom.xml index 3d07c38..3717b9b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib dnet-dedup - 3.0.1 + 3.0.1-SNAPSHOT pom @@ -22,7 +22,7 @@ scm:git:https://github.com/dnet-team/dnet-dedup.git - dnet-dedup-3.0.1 + HEAD From 4c69ddd3840898e3402b33657b0ec5863dbb6615 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 11:40:34 +0100 Subject: [PATCH 08/12] [maven-release-plugin] prepare release dnet-dedup-3.0.1 --- dnet-dedup-test/pom.xml | 2 +- dnet-pace-core/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dnet-dedup-test/pom.xml b/dnet-dedup-test/pom.xml index 43a7c2b..f5bc508 100644 --- a/dnet-dedup-test/pom.xml +++ b/dnet-dedup-test/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib dnet-dedup - 3.0.1-SNAPSHOT + 3.0.1 ../pom.xml diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index 51958c5..b0ba269 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 diff --git a/pom.xml b/pom.xml index 3717b9b..3d07c38 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib dnet-dedup - 3.0.1-SNAPSHOT + 3.0.1 pom @@ -22,7 +22,7 @@ scm:git:https://github.com/dnet-team/dnet-dedup.git - HEAD + dnet-dedup-3.0.1 From c7d6b1a41a183d9e193e8ca4d4a0279b1a86adc8 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 11:40:42 +0100 Subject: [PATCH 09/12] [maven-release-plugin] prepare for next development iteration --- dnet-dedup-test/pom.xml | 2 +- dnet-pace-core/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dnet-dedup-test/pom.xml b/dnet-dedup-test/pom.xml index f5bc508..66e2a3d 100644 --- a/dnet-dedup-test/pom.xml +++ b/dnet-dedup-test/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib dnet-dedup - 3.0.1 + 3.0.2-SNAPSHOT ../pom.xml diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index b0ba269..2d07fb2 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 diff --git a/pom.xml b/pom.xml index 3d07c38..b89705d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib dnet-dedup - 3.0.1 + 3.0.2-SNAPSHOT pom @@ -22,7 +22,7 @@ scm:git:https://github.com/dnet-team/dnet-dedup.git - dnet-dedup-3.0.1 + HEAD From 925a437597f7b43c3acc62021eac641990ed4095 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 12:46:06 +0100 Subject: [PATCH 10/12] getting rid of spark libs from dnet-pace-core --- dnet-pace-core/pom.xml | 11 ++++++++-- .../pace/common/AbstractPaceFunctions.java | 22 ++++++++----------- pom.xml | 11 ++++++++++ 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index 2d07fb2..dfe9705 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 9fa67d7..d07b197 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 diff --git a/pom.xml b/pom.xml index b89705d..5101f00 100644 --- a/pom.xml +++ b/pom.xml @@ -125,6 +125,17 @@ 6.2.18 + + com.fasterxml.jackson.core + jackson-databind + 2.6.6 + + + org.codehaus.jackson + jackson-mapper-asl + 1.9.13 + + com.google.guava From 99379e250524a7d7b8fa7c85f842aeb63fd78ae0 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 12:46:42 +0100 Subject: [PATCH 11/12] [maven-release-plugin] prepare release dnet-dedup-3.0.2 --- dnet-dedup-test/pom.xml | 2 +- dnet-pace-core/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dnet-dedup-test/pom.xml b/dnet-dedup-test/pom.xml index 66e2a3d..da73e90 100644 --- a/dnet-dedup-test/pom.xml +++ b/dnet-dedup-test/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib dnet-dedup - 3.0.2-SNAPSHOT + 3.0.2 ../pom.xml diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index dfe9705..066306d 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 diff --git a/pom.xml b/pom.xml index 5101f00..3a7fe8e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib dnet-dedup - 3.0.2-SNAPSHOT + 3.0.2 pom @@ -22,7 +22,7 @@ scm:git:https://github.com/dnet-team/dnet-dedup.git - HEAD + dnet-dedup-3.0.2 From 1f9b908d6c7a5f5e9eff6199a11c706ec022db89 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 12:46:50 +0100 Subject: [PATCH 12/12] [maven-release-plugin] prepare for next development iteration --- dnet-dedup-test/pom.xml | 2 +- dnet-pace-core/pom.xml | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dnet-dedup-test/pom.xml b/dnet-dedup-test/pom.xml index da73e90..900d214 100644 --- a/dnet-dedup-test/pom.xml +++ b/dnet-dedup-test/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib dnet-dedup - 3.0.2 + 3.0.3-SNAPSHOT ../pom.xml diff --git a/dnet-pace-core/pom.xml b/dnet-pace-core/pom.xml index 066306d..d0b4a15 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 diff --git a/pom.xml b/pom.xml index 3a7fe8e..9047c59 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib dnet-dedup - 3.0.2 + 3.0.3-SNAPSHOT pom @@ -22,7 +22,7 @@ scm:git:https://github.com/dnet-team/dnet-dedup.git - dnet-dedup-3.0.2 + HEAD