From b7bc7f0401cc5b28ebf7f4ed702beb9432721580 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Mon, 12 Nov 2018 12:46:06 +0100 Subject: [PATCH] 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