From bd3fcf869a8fa06376d94af37f0e8fd992cdc486 Mon Sep 17 00:00:00 2001 From: Giambattista Bloisi Date: Thu, 6 Jul 2023 10:02:23 +0200 Subject: [PATCH] rename dnet-pace-core into dhp-pace-core module and use it as dependency in other modules --- dhp-common/pom.xml | 10 +-- {dnet-pace-core => dhp-pace-core}/pom.xml | 48 ++++++++--- .../AbstractClusteringFunction.java | 0 .../eu/dnetlib/pace/clustering/Acronyms.java | 0 .../BlacklistAwareClusteringCombiner.java | 0 .../pace/clustering/ClusteringClass.java | 0 .../pace/clustering/ClusteringCombiner.java | 0 .../pace/clustering/ClusteringFunction.java | 0 .../pace/clustering/ImmutableFieldValue.java | 0 .../pace/clustering/KeywordsClustering.java | 0 .../pace/clustering/LastNameFirstInitial.java | 0 .../pace/clustering/LowercaseClustering.java | 0 .../dnetlib/pace/clustering/NGramUtils.java | 0 .../dnetlib/pace/clustering/NgramPairs.java | 0 .../eu/dnetlib/pace/clustering/Ngrams.java | 0 .../pace/clustering/PersonClustering.java | 0 .../dnetlib/pace/clustering/PersonHash.java | 0 .../clustering/RandomClusteringFunction.java | 0 .../pace/clustering/SortedNgramPairs.java | 0 .../clustering/SpaceTrimmingFieldValue.java | 0 .../dnetlib/pace/clustering/SuffixPrefix.java | 0 .../pace/clustering/UrlClustering.java | 0 .../WordsStatsSuffixPrefixChain.java | 0 .../pace/clustering/WordsSuffixPrefix.java | 0 .../pace/common/AbstractPaceFunctions.java | 0 .../java/eu/dnetlib/pace/config/Config.java | 0 .../eu/dnetlib/pace/config/DedupConfig.java | 0 .../eu/dnetlib/pace/config/PaceConfig.java | 0 .../java/eu/dnetlib/pace/config/Type.java | 0 .../java/eu/dnetlib/pace/config/WfConfig.java | 0 .../eu/dnetlib/pace/model/AbstractField.java | 0 .../eu/dnetlib/pace/model/ClusteringDef.java | 0 .../java/eu/dnetlib/pace/model/Document.java | 0 .../java/eu/dnetlib/pace/model/Field.java | 0 .../java/eu/dnetlib/pace/model/FieldDef.java | 0 .../java/eu/dnetlib/pace/model/FieldList.java | 0 .../eu/dnetlib/pace/model/FieldListImpl.java | 0 .../eu/dnetlib/pace/model/FieldValue.java | 0 .../eu/dnetlib/pace/model/FieldValueImpl.java | 0 .../eu/dnetlib/pace/model/MapDocument.java | 0 .../pace/model/MapDocumentComparator.java | 0 .../pace/model/MapDocumentSerializer.java | 0 .../java/eu/dnetlib/pace/model/Person.java | 0 .../pace/model/PersonComparatorUtils.java | 0 .../eu/dnetlib/pace/tree/AlwaysMatch.java | 0 .../eu/dnetlib/pace/tree/AuthorsMatch.java | 0 .../java/eu/dnetlib/pace/tree/CityMatch.java | 0 .../dnetlib/pace/tree/CosineSimilarity.java | 0 .../eu/dnetlib/pace/tree/DoiExactMatch.java | 0 .../dnetlib/pace/tree/DomainExactMatch.java | 0 .../java/eu/dnetlib/pace/tree/ExactMatch.java | 0 .../pace/tree/ExactMatchIgnoreCase.java | 0 .../dnetlib/pace/tree/InstanceTypeMatch.java | 0 .../eu/dnetlib/pace/tree/JaroWinkler.java | 0 .../pace/tree/JaroWinklerNormalizedName.java | 0 .../dnetlib/pace/tree/JaroWinklerTitle.java | 0 .../eu/dnetlib/pace/tree/JsonListMatch.java | 0 .../eu/dnetlib/pace/tree/KeywordMatch.java | 0 .../dnetlib/pace/tree/Level2JaroWinkler.java | 0 .../pace/tree/Level2JaroWinklerTitle.java | 0 .../dnetlib/pace/tree/Level2Levenstein.java | 0 .../java/eu/dnetlib/pace/tree/Levenstein.java | 0 .../eu/dnetlib/pace/tree/LevensteinTitle.java | 0 .../tree/LevensteinTitleIgnoreVersion.java | 0 .../dnetlib/pace/tree/ListContainsMatch.java | 0 .../eu/dnetlib/pace/tree/MustBeDifferent.java | 0 .../dnetlib/pace/tree/NullDistanceAlgo.java | 0 .../dnetlib/pace/tree/NumbersComparator.java | 0 .../eu/dnetlib/pace/tree/NumbersMatch.java | 0 .../eu/dnetlib/pace/tree/RomansMatch.java | 0 .../java/eu/dnetlib/pace/tree/SizeMatch.java | 0 .../dnetlib/pace/tree/SortedJaroWinkler.java | 0 .../pace/tree/SortedLevel2JaroWinkler.java | 0 .../pace/tree/StringContainsMatch.java | 0 .../eu/dnetlib/pace/tree/StringListMatch.java | 0 .../pace/tree/SubStringLevenstein.java | 0 .../dnetlib/pace/tree/TitleVersionMatch.java | 0 .../java/eu/dnetlib/pace/tree/UrlMatcher.java | 0 .../java/eu/dnetlib/pace/tree/YearMatch.java | 0 .../pace/tree/support/AbstractComparator.java | 0 .../support/AbstractSortedComparator.java | 0 .../eu/dnetlib/pace/tree/support/AggType.java | 0 .../dnetlib/pace/tree/support/Comparator.java | 0 .../pace/tree/support/ComparatorClass.java | 0 .../dnetlib/pace/tree/support/FieldConf.java | 0 .../dnetlib/pace/tree/support/FieldStats.java | 0 .../dnetlib/pace/tree/support/MatchType.java | 0 .../pace/tree/support/TreeNodeDef.java | 0 .../pace/tree/support/TreeNodeStats.java | 0 .../pace/tree/support/TreeProcessor.java | 0 .../dnetlib/pace/tree/support/TreeStats.java | 0 .../eu/dnetlib/pace/util/BlockProcessor.java | 0 .../pace/util/BlockProcessorForTesting.java | 0 .../java/eu/dnetlib/pace/util/Capitalise.java | 0 .../eu/dnetlib/pace/util/DiffPatchMatch.java | 0 .../dnetlib/pace/util/DotAbbreviations.java | 0 .../eu/dnetlib/pace/util/MapDocumentUtil.java | 0 .../eu/dnetlib/pace/util/PaceException.java | 0 .../eu/dnetlib/pace/util/PaceResolver.java | 0 .../java/eu/dnetlib/pace/util/Reporter.java | 0 .../eu/dnetlib/pace/config/city_map.csv | 0 .../eu/dnetlib/pace/config/dedupConfig.st | 0 .../eu/dnetlib/pace/config/name_particles.txt | 0 .../dnetlib/pace/config/ngram_blacklist.txt | 0 .../eu/dnetlib/pace/config/stopwords_de.txt | 0 .../eu/dnetlib/pace/config/stopwords_en.txt | 0 .../eu/dnetlib/pace/config/stopwords_es.txt | 0 .../eu/dnetlib/pace/config/stopwords_fr.txt | 0 .../eu/dnetlib/pace/config/stopwords_gr.txt | 0 .../eu/dnetlib/pace/config/stopwords_it.txt | 0 .../eu/dnetlib/pace/config/stopwords_pt.txt | 0 .../dnetlib/pace/config/title_blacklist.txt | 0 .../dnetlib/pace/config/translation_map.csv | 0 .../eu/dnetlib/pace/AbstractPaceTest.java | 0 .../clustering/ClusteringFunctionTest.java | 0 .../dnetlib/pace/common/PaceFunctionTest.java | 0 .../pace/comparators/ComparatorTest.java | 0 .../eu/dnetlib/pace/config/ConfigTest.java | 0 .../java/eu/dnetlib/pace/util/UtilTest.java | 0 .../dnetlib/pace/config/author.fdup.conf.json | 0 .../eu/dnetlib/pace/config/author.json | 0 .../organization.cross.compare.conf.json | 0 .../config/organization.current.conf.json | 0 .../eu/dnetlib/pace/config/organization.json | 0 .../config/organization.no_synonyms.conf.json | 0 .../config/pub.instancetype.tree.conf.json | 0 .../pace/config/pub.new.tree.conf.json | 0 .../eu/dnetlib/pace/config/pub.prod.conf.json | 0 .../pace/config/publication.current.conf.json | 0 .../pace/config/publication.example.json | 0 .../eu/dnetlib/pace/config/publication.json | 0 .../dnetlib/pace/config/title_blacklist.txt | 0 dhp-workflows/dhp-broker-events/pom.xml | 5 +- dhp-workflows/dhp-dedup-openaire/pom.xml | 39 ++++++--- dhp-workflows/dhp-graph-provision/pom.xml | 2 +- pom.xml | 81 +++++++++++++++++-- 136 files changed, 146 insertions(+), 39 deletions(-) rename {dnet-pace-core => dhp-pace-core}/pom.xml (64%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/AbstractClusteringFunction.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/Acronyms.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/BlacklistAwareClusteringCombiner.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/ClusteringClass.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/ClusteringCombiner.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/ClusteringFunction.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/ImmutableFieldValue.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/KeywordsClustering.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/LastNameFirstInitial.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/LowercaseClustering.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/NGramUtils.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/NgramPairs.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/Ngrams.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/PersonClustering.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/PersonHash.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/RandomClusteringFunction.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/SortedNgramPairs.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/SpaceTrimmingFieldValue.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/SuffixPrefix.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/UrlClustering.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/WordsStatsSuffixPrefixChain.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/clustering/WordsSuffixPrefix.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/common/AbstractPaceFunctions.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/config/Config.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/config/DedupConfig.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/config/PaceConfig.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/config/Type.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/config/WfConfig.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/model/AbstractField.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/model/ClusteringDef.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/model/Document.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/model/Field.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/model/FieldDef.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/model/FieldList.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/model/FieldListImpl.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/model/FieldValue.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/model/FieldValueImpl.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/model/MapDocument.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/model/MapDocumentComparator.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/model/MapDocumentSerializer.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/model/Person.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/model/PersonComparatorUtils.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/AlwaysMatch.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/AuthorsMatch.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/CityMatch.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/CosineSimilarity.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/DoiExactMatch.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/DomainExactMatch.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/ExactMatch.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/ExactMatchIgnoreCase.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/InstanceTypeMatch.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/JaroWinkler.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/JaroWinklerNormalizedName.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/JaroWinklerTitle.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/JsonListMatch.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/KeywordMatch.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/Level2JaroWinkler.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/Level2JaroWinklerTitle.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/Level2Levenstein.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/Levenstein.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/LevensteinTitle.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/LevensteinTitleIgnoreVersion.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/ListContainsMatch.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/MustBeDifferent.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/NullDistanceAlgo.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/NumbersComparator.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/NumbersMatch.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/RomansMatch.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/SizeMatch.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/SortedJaroWinkler.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/SortedLevel2JaroWinkler.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/StringContainsMatch.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/StringListMatch.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/SubStringLevenstein.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/TitleVersionMatch.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/UrlMatcher.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/YearMatch.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/support/AbstractComparator.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/support/AbstractSortedComparator.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/support/AggType.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/support/Comparator.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/support/ComparatorClass.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/support/FieldConf.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/support/FieldStats.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/support/MatchType.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/support/TreeNodeDef.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/support/TreeNodeStats.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/support/TreeProcessor.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/tree/support/TreeStats.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/util/BlockProcessor.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/util/BlockProcessorForTesting.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/util/Capitalise.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/util/DiffPatchMatch.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/util/DotAbbreviations.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/util/MapDocumentUtil.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/util/PaceException.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/util/PaceResolver.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/java/eu/dnetlib/pace/util/Reporter.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/resources/eu/dnetlib/pace/config/city_map.csv (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/resources/eu/dnetlib/pace/config/dedupConfig.st (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/resources/eu/dnetlib/pace/config/name_particles.txt (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/resources/eu/dnetlib/pace/config/ngram_blacklist.txt (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/resources/eu/dnetlib/pace/config/stopwords_de.txt (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/resources/eu/dnetlib/pace/config/stopwords_en.txt (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/resources/eu/dnetlib/pace/config/stopwords_es.txt (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/resources/eu/dnetlib/pace/config/stopwords_fr.txt (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/resources/eu/dnetlib/pace/config/stopwords_gr.txt (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/resources/eu/dnetlib/pace/config/stopwords_it.txt (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/resources/eu/dnetlib/pace/config/stopwords_pt.txt (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/resources/eu/dnetlib/pace/config/title_blacklist.txt (100%) rename {dnet-pace-core => dhp-pace-core}/src/main/resources/eu/dnetlib/pace/config/translation_map.csv (100%) rename {dnet-pace-core => dhp-pace-core}/src/test/java/eu/dnetlib/pace/AbstractPaceTest.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/test/java/eu/dnetlib/pace/clustering/ClusteringFunctionTest.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/test/java/eu/dnetlib/pace/common/PaceFunctionTest.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/test/java/eu/dnetlib/pace/comparators/ComparatorTest.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/test/java/eu/dnetlib/pace/config/ConfigTest.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/test/java/eu/dnetlib/pace/util/UtilTest.java (100%) rename {dnet-pace-core => dhp-pace-core}/src/test/resources/eu/dnetlib/pace/config/author.fdup.conf.json (100%) rename {dnet-pace-core => dhp-pace-core}/src/test/resources/eu/dnetlib/pace/config/author.json (100%) rename {dnet-pace-core => dhp-pace-core}/src/test/resources/eu/dnetlib/pace/config/organization.cross.compare.conf.json (100%) rename {dnet-pace-core => dhp-pace-core}/src/test/resources/eu/dnetlib/pace/config/organization.current.conf.json (100%) rename {dnet-pace-core => dhp-pace-core}/src/test/resources/eu/dnetlib/pace/config/organization.json (100%) rename {dnet-pace-core => dhp-pace-core}/src/test/resources/eu/dnetlib/pace/config/organization.no_synonyms.conf.json (100%) rename {dnet-pace-core => dhp-pace-core}/src/test/resources/eu/dnetlib/pace/config/pub.instancetype.tree.conf.json (100%) rename {dnet-pace-core => dhp-pace-core}/src/test/resources/eu/dnetlib/pace/config/pub.new.tree.conf.json (100%) rename {dnet-pace-core => dhp-pace-core}/src/test/resources/eu/dnetlib/pace/config/pub.prod.conf.json (100%) rename {dnet-pace-core => dhp-pace-core}/src/test/resources/eu/dnetlib/pace/config/publication.current.conf.json (100%) rename {dnet-pace-core => dhp-pace-core}/src/test/resources/eu/dnetlib/pace/config/publication.example.json (100%) rename {dnet-pace-core => dhp-pace-core}/src/test/resources/eu/dnetlib/pace/config/publication.json (100%) rename {dnet-pace-core => dhp-pace-core}/src/test/resources/eu/dnetlib/pace/config/title_blacklist.txt (100%) diff --git a/dhp-common/pom.xml b/dhp-common/pom.xml index 6df11f4ea..a7a83821e 100644 --- a/dhp-common/pom.xml +++ b/dhp-common/pom.xml @@ -60,6 +60,11 @@ + + eu.dnetlib.dhp + dhp-pace-core + ${project.version} + org.apache.hadoop @@ -142,11 +147,6 @@ okhttp - - eu.dnetlib - dnet-pace-core - - org.apache.httpcomponents httpclient diff --git a/dnet-pace-core/pom.xml b/dhp-pace-core/pom.xml similarity index 64% rename from dnet-pace-core/pom.xml rename to dhp-pace-core/pom.xml index 567420bb3..12174a5c5 100644 --- a/dnet-pace-core/pom.xml +++ b/dhp-pace-core/pom.xml @@ -4,15 +4,49 @@ 4.0.0 - eu.dnetlib - dnet-dedup - 4.1.13-SNAPSHOT + eu.dnetlib.dhp + dhp + 1.2.5-SNAPSHOT ../pom.xml - dnet-pace-core + eu.dnetlib.dhp + dhp-pace-core + 1.2.5-SNAPSHOT jar + + + + net.alchim31.maven + scala-maven-plugin + 4.0.1 + + + scala-compile-first + initialize + + add-source + compile + + + + scala-test-compile + process-test-resources + + testCompile + + + + + ${scala.version} + -target:jvm-1.8 + + + + + + edu.cmu @@ -43,12 +77,6 @@ commons-logging commons-logging - - - org.junit.jupiter - junit-jupiter - test - org.reflections reflections diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/AbstractClusteringFunction.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/AbstractClusteringFunction.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/AbstractClusteringFunction.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/AbstractClusteringFunction.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/Acronyms.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/Acronyms.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/Acronyms.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/Acronyms.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/BlacklistAwareClusteringCombiner.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/BlacklistAwareClusteringCombiner.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/BlacklistAwareClusteringCombiner.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/BlacklistAwareClusteringCombiner.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/ClusteringClass.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/ClusteringClass.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/ClusteringClass.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/ClusteringClass.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/ClusteringCombiner.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/ClusteringCombiner.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/ClusteringCombiner.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/ClusteringCombiner.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/ClusteringFunction.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/ClusteringFunction.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/ClusteringFunction.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/ClusteringFunction.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/ImmutableFieldValue.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/ImmutableFieldValue.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/ImmutableFieldValue.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/ImmutableFieldValue.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/KeywordsClustering.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/KeywordsClustering.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/KeywordsClustering.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/KeywordsClustering.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/LastNameFirstInitial.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/LastNameFirstInitial.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/LastNameFirstInitial.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/LastNameFirstInitial.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/LowercaseClustering.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/LowercaseClustering.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/LowercaseClustering.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/LowercaseClustering.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/NGramUtils.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/NGramUtils.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/NGramUtils.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/NGramUtils.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/NgramPairs.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/NgramPairs.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/NgramPairs.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/NgramPairs.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/Ngrams.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/Ngrams.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/Ngrams.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/Ngrams.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/PersonClustering.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/PersonClustering.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/PersonClustering.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/PersonClustering.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/PersonHash.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/PersonHash.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/PersonHash.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/PersonHash.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/RandomClusteringFunction.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/RandomClusteringFunction.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/RandomClusteringFunction.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/RandomClusteringFunction.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/SortedNgramPairs.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/SortedNgramPairs.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/SortedNgramPairs.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/SortedNgramPairs.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/SpaceTrimmingFieldValue.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/SpaceTrimmingFieldValue.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/SpaceTrimmingFieldValue.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/SpaceTrimmingFieldValue.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/SuffixPrefix.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/SuffixPrefix.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/SuffixPrefix.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/SuffixPrefix.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/UrlClustering.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/UrlClustering.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/UrlClustering.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/UrlClustering.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/WordsStatsSuffixPrefixChain.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/WordsStatsSuffixPrefixChain.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/WordsStatsSuffixPrefixChain.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/WordsStatsSuffixPrefixChain.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/WordsSuffixPrefix.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/WordsSuffixPrefix.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/clustering/WordsSuffixPrefix.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/clustering/WordsSuffixPrefix.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/common/AbstractPaceFunctions.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/common/AbstractPaceFunctions.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/common/AbstractPaceFunctions.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/common/AbstractPaceFunctions.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/config/Config.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/config/Config.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/config/Config.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/config/Config.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/config/DedupConfig.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/config/DedupConfig.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/config/DedupConfig.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/config/DedupConfig.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/config/PaceConfig.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/config/PaceConfig.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/config/PaceConfig.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/config/PaceConfig.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/config/Type.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/config/Type.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/config/Type.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/config/Type.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/config/WfConfig.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/config/WfConfig.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/config/WfConfig.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/config/WfConfig.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/model/AbstractField.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/model/AbstractField.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/model/AbstractField.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/model/AbstractField.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/model/ClusteringDef.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/model/ClusteringDef.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/model/ClusteringDef.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/model/ClusteringDef.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/model/Document.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/model/Document.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/model/Document.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/model/Document.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/model/Field.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/model/Field.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/model/Field.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/model/Field.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/model/FieldDef.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/model/FieldDef.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/model/FieldDef.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/model/FieldDef.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/model/FieldList.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/model/FieldList.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/model/FieldList.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/model/FieldList.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/model/FieldListImpl.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/model/FieldListImpl.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/model/FieldListImpl.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/model/FieldListImpl.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/model/FieldValue.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/model/FieldValue.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/model/FieldValue.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/model/FieldValue.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/model/FieldValueImpl.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/model/FieldValueImpl.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/model/FieldValueImpl.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/model/FieldValueImpl.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/model/MapDocument.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/model/MapDocument.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/model/MapDocument.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/model/MapDocument.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/model/MapDocumentComparator.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/model/MapDocumentComparator.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/model/MapDocumentComparator.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/model/MapDocumentComparator.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/model/MapDocumentSerializer.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/model/MapDocumentSerializer.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/model/MapDocumentSerializer.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/model/MapDocumentSerializer.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/model/Person.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/model/Person.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/model/Person.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/model/Person.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/model/PersonComparatorUtils.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/model/PersonComparatorUtils.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/model/PersonComparatorUtils.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/model/PersonComparatorUtils.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/AlwaysMatch.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/AlwaysMatch.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/AlwaysMatch.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/AlwaysMatch.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/AuthorsMatch.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/AuthorsMatch.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/AuthorsMatch.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/AuthorsMatch.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/CityMatch.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/CityMatch.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/CityMatch.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/CityMatch.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/CosineSimilarity.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/CosineSimilarity.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/CosineSimilarity.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/CosineSimilarity.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/DoiExactMatch.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/DoiExactMatch.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/DoiExactMatch.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/DoiExactMatch.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/DomainExactMatch.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/DomainExactMatch.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/DomainExactMatch.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/DomainExactMatch.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/ExactMatch.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/ExactMatch.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/ExactMatch.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/ExactMatch.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/ExactMatchIgnoreCase.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/ExactMatchIgnoreCase.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/ExactMatchIgnoreCase.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/ExactMatchIgnoreCase.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/InstanceTypeMatch.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/InstanceTypeMatch.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/InstanceTypeMatch.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/InstanceTypeMatch.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/JaroWinkler.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/JaroWinkler.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/JaroWinkler.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/JaroWinkler.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/JaroWinklerNormalizedName.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/JaroWinklerNormalizedName.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/JaroWinklerNormalizedName.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/JaroWinklerNormalizedName.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/JaroWinklerTitle.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/JaroWinklerTitle.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/JaroWinklerTitle.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/JaroWinklerTitle.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/JsonListMatch.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/JsonListMatch.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/JsonListMatch.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/JsonListMatch.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/KeywordMatch.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/KeywordMatch.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/KeywordMatch.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/KeywordMatch.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/Level2JaroWinkler.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/Level2JaroWinkler.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/Level2JaroWinkler.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/Level2JaroWinkler.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/Level2JaroWinklerTitle.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/Level2JaroWinklerTitle.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/Level2JaroWinklerTitle.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/Level2JaroWinklerTitle.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/Level2Levenstein.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/Level2Levenstein.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/Level2Levenstein.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/Level2Levenstein.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/Levenstein.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/Levenstein.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/Levenstein.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/Levenstein.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/LevensteinTitle.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/LevensteinTitle.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/LevensteinTitle.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/LevensteinTitle.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/LevensteinTitleIgnoreVersion.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/LevensteinTitleIgnoreVersion.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/LevensteinTitleIgnoreVersion.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/LevensteinTitleIgnoreVersion.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/ListContainsMatch.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/ListContainsMatch.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/ListContainsMatch.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/ListContainsMatch.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/MustBeDifferent.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/MustBeDifferent.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/MustBeDifferent.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/MustBeDifferent.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/NullDistanceAlgo.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/NullDistanceAlgo.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/NullDistanceAlgo.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/NullDistanceAlgo.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/NumbersComparator.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/NumbersComparator.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/NumbersComparator.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/NumbersComparator.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/NumbersMatch.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/NumbersMatch.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/NumbersMatch.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/NumbersMatch.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/RomansMatch.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/RomansMatch.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/RomansMatch.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/RomansMatch.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/SizeMatch.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/SizeMatch.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/SizeMatch.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/SizeMatch.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/SortedJaroWinkler.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/SortedJaroWinkler.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/SortedJaroWinkler.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/SortedJaroWinkler.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/SortedLevel2JaroWinkler.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/SortedLevel2JaroWinkler.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/SortedLevel2JaroWinkler.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/SortedLevel2JaroWinkler.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/StringContainsMatch.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/StringContainsMatch.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/StringContainsMatch.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/StringContainsMatch.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/StringListMatch.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/StringListMatch.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/StringListMatch.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/StringListMatch.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/SubStringLevenstein.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/SubStringLevenstein.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/SubStringLevenstein.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/SubStringLevenstein.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/TitleVersionMatch.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/TitleVersionMatch.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/TitleVersionMatch.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/TitleVersionMatch.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/UrlMatcher.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/UrlMatcher.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/UrlMatcher.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/UrlMatcher.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/YearMatch.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/YearMatch.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/YearMatch.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/YearMatch.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/AbstractComparator.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/AbstractComparator.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/AbstractComparator.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/AbstractComparator.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/AbstractSortedComparator.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/AbstractSortedComparator.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/AbstractSortedComparator.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/AbstractSortedComparator.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/AggType.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/AggType.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/AggType.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/AggType.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/Comparator.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/Comparator.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/Comparator.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/Comparator.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/ComparatorClass.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/ComparatorClass.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/ComparatorClass.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/ComparatorClass.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/FieldConf.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/FieldConf.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/FieldConf.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/FieldConf.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/FieldStats.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/FieldStats.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/FieldStats.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/FieldStats.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/MatchType.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/MatchType.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/MatchType.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/MatchType.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/TreeNodeDef.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/TreeNodeDef.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/TreeNodeDef.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/TreeNodeDef.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/TreeNodeStats.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/TreeNodeStats.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/TreeNodeStats.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/TreeNodeStats.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/TreeProcessor.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/TreeProcessor.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/TreeProcessor.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/TreeProcessor.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/TreeStats.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/TreeStats.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/tree/support/TreeStats.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/tree/support/TreeStats.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/util/BlockProcessor.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/util/BlockProcessor.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/util/BlockProcessor.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/util/BlockProcessor.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/util/BlockProcessorForTesting.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/util/BlockProcessorForTesting.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/util/BlockProcessorForTesting.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/util/BlockProcessorForTesting.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/util/Capitalise.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/util/Capitalise.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/util/Capitalise.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/util/Capitalise.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/util/DiffPatchMatch.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/util/DiffPatchMatch.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/util/DiffPatchMatch.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/util/DiffPatchMatch.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/util/DotAbbreviations.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/util/DotAbbreviations.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/util/DotAbbreviations.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/util/DotAbbreviations.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/util/MapDocumentUtil.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/util/MapDocumentUtil.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/util/MapDocumentUtil.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/util/MapDocumentUtil.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/util/PaceException.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/util/PaceException.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/util/PaceException.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/util/PaceException.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/util/PaceResolver.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/util/PaceResolver.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/util/PaceResolver.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/util/PaceResolver.java diff --git a/dnet-pace-core/src/main/java/eu/dnetlib/pace/util/Reporter.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/util/Reporter.java similarity index 100% rename from dnet-pace-core/src/main/java/eu/dnetlib/pace/util/Reporter.java rename to dhp-pace-core/src/main/java/eu/dnetlib/pace/util/Reporter.java diff --git a/dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/city_map.csv b/dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/city_map.csv similarity index 100% rename from dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/city_map.csv rename to dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/city_map.csv diff --git a/dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/dedupConfig.st b/dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/dedupConfig.st similarity index 100% rename from dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/dedupConfig.st rename to dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/dedupConfig.st diff --git a/dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/name_particles.txt b/dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/name_particles.txt similarity index 100% rename from dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/name_particles.txt rename to dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/name_particles.txt diff --git a/dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/ngram_blacklist.txt b/dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/ngram_blacklist.txt similarity index 100% rename from dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/ngram_blacklist.txt rename to dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/ngram_blacklist.txt diff --git a/dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_de.txt b/dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_de.txt similarity index 100% rename from dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_de.txt rename to dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_de.txt diff --git a/dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_en.txt b/dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_en.txt similarity index 100% rename from dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_en.txt rename to dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_en.txt diff --git a/dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_es.txt b/dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_es.txt similarity index 100% rename from dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_es.txt rename to dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_es.txt diff --git a/dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_fr.txt b/dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_fr.txt similarity index 100% rename from dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_fr.txt rename to dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_fr.txt diff --git a/dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_gr.txt b/dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_gr.txt similarity index 100% rename from dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_gr.txt rename to dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_gr.txt diff --git a/dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_it.txt b/dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_it.txt similarity index 100% rename from dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_it.txt rename to dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_it.txt diff --git a/dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_pt.txt b/dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_pt.txt similarity index 100% rename from dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_pt.txt rename to dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/stopwords_pt.txt diff --git a/dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/title_blacklist.txt b/dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/title_blacklist.txt similarity index 100% rename from dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/title_blacklist.txt rename to dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/title_blacklist.txt diff --git a/dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/translation_map.csv b/dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/translation_map.csv similarity index 100% rename from dnet-pace-core/src/main/resources/eu/dnetlib/pace/config/translation_map.csv rename to dhp-pace-core/src/main/resources/eu/dnetlib/pace/config/translation_map.csv diff --git a/dnet-pace-core/src/test/java/eu/dnetlib/pace/AbstractPaceTest.java b/dhp-pace-core/src/test/java/eu/dnetlib/pace/AbstractPaceTest.java similarity index 100% rename from dnet-pace-core/src/test/java/eu/dnetlib/pace/AbstractPaceTest.java rename to dhp-pace-core/src/test/java/eu/dnetlib/pace/AbstractPaceTest.java diff --git a/dnet-pace-core/src/test/java/eu/dnetlib/pace/clustering/ClusteringFunctionTest.java b/dhp-pace-core/src/test/java/eu/dnetlib/pace/clustering/ClusteringFunctionTest.java similarity index 100% rename from dnet-pace-core/src/test/java/eu/dnetlib/pace/clustering/ClusteringFunctionTest.java rename to dhp-pace-core/src/test/java/eu/dnetlib/pace/clustering/ClusteringFunctionTest.java diff --git a/dnet-pace-core/src/test/java/eu/dnetlib/pace/common/PaceFunctionTest.java b/dhp-pace-core/src/test/java/eu/dnetlib/pace/common/PaceFunctionTest.java similarity index 100% rename from dnet-pace-core/src/test/java/eu/dnetlib/pace/common/PaceFunctionTest.java rename to dhp-pace-core/src/test/java/eu/dnetlib/pace/common/PaceFunctionTest.java diff --git a/dnet-pace-core/src/test/java/eu/dnetlib/pace/comparators/ComparatorTest.java b/dhp-pace-core/src/test/java/eu/dnetlib/pace/comparators/ComparatorTest.java similarity index 100% rename from dnet-pace-core/src/test/java/eu/dnetlib/pace/comparators/ComparatorTest.java rename to dhp-pace-core/src/test/java/eu/dnetlib/pace/comparators/ComparatorTest.java diff --git a/dnet-pace-core/src/test/java/eu/dnetlib/pace/config/ConfigTest.java b/dhp-pace-core/src/test/java/eu/dnetlib/pace/config/ConfigTest.java similarity index 100% rename from dnet-pace-core/src/test/java/eu/dnetlib/pace/config/ConfigTest.java rename to dhp-pace-core/src/test/java/eu/dnetlib/pace/config/ConfigTest.java diff --git a/dnet-pace-core/src/test/java/eu/dnetlib/pace/util/UtilTest.java b/dhp-pace-core/src/test/java/eu/dnetlib/pace/util/UtilTest.java similarity index 100% rename from dnet-pace-core/src/test/java/eu/dnetlib/pace/util/UtilTest.java rename to dhp-pace-core/src/test/java/eu/dnetlib/pace/util/UtilTest.java diff --git a/dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/author.fdup.conf.json b/dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/author.fdup.conf.json similarity index 100% rename from dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/author.fdup.conf.json rename to dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/author.fdup.conf.json diff --git a/dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/author.json b/dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/author.json similarity index 100% rename from dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/author.json rename to dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/author.json diff --git a/dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/organization.cross.compare.conf.json b/dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/organization.cross.compare.conf.json similarity index 100% rename from dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/organization.cross.compare.conf.json rename to dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/organization.cross.compare.conf.json diff --git a/dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/organization.current.conf.json b/dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/organization.current.conf.json similarity index 100% rename from dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/organization.current.conf.json rename to dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/organization.current.conf.json diff --git a/dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/organization.json b/dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/organization.json similarity index 100% rename from dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/organization.json rename to dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/organization.json diff --git a/dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/organization.no_synonyms.conf.json b/dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/organization.no_synonyms.conf.json similarity index 100% rename from dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/organization.no_synonyms.conf.json rename to dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/organization.no_synonyms.conf.json diff --git a/dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/pub.instancetype.tree.conf.json b/dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/pub.instancetype.tree.conf.json similarity index 100% rename from dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/pub.instancetype.tree.conf.json rename to dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/pub.instancetype.tree.conf.json diff --git a/dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/pub.new.tree.conf.json b/dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/pub.new.tree.conf.json similarity index 100% rename from dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/pub.new.tree.conf.json rename to dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/pub.new.tree.conf.json diff --git a/dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/pub.prod.conf.json b/dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/pub.prod.conf.json similarity index 100% rename from dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/pub.prod.conf.json rename to dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/pub.prod.conf.json diff --git a/dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/publication.current.conf.json b/dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/publication.current.conf.json similarity index 100% rename from dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/publication.current.conf.json rename to dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/publication.current.conf.json diff --git a/dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/publication.example.json b/dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/publication.example.json similarity index 100% rename from dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/publication.example.json rename to dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/publication.example.json diff --git a/dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/publication.json b/dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/publication.json similarity index 100% rename from dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/publication.json rename to dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/publication.json diff --git a/dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/title_blacklist.txt b/dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/title_blacklist.txt similarity index 100% rename from dnet-pace-core/src/test/resources/eu/dnetlib/pace/config/title_blacklist.txt rename to dhp-pace-core/src/test/resources/eu/dnetlib/pace/config/title_blacklist.txt diff --git a/dhp-workflows/dhp-broker-events/pom.xml b/dhp-workflows/dhp-broker-events/pom.xml index 5a41a0090..01f1ea321 100644 --- a/dhp-workflows/dhp-broker-events/pom.xml +++ b/dhp-workflows/dhp-broker-events/pom.xml @@ -41,8 +41,9 @@ - eu.dnetlib - dnet-pace-core + eu.dnetlib.dhp + dhp-pace-core + ${project.version} diff --git a/dhp-workflows/dhp-dedup-openaire/pom.xml b/dhp-workflows/dhp-dedup-openaire/pom.xml index a14076a78..af4511c3c 100644 --- a/dhp-workflows/dhp-dedup-openaire/pom.xml +++ b/dhp-workflows/dhp-dedup-openaire/pom.xml @@ -41,6 +41,30 @@ + + eu.dnetlib.dhp + dhp-common + ${project.version} + + + + eu.dnetlib.dhp + dhp-pace-core + ${project.version} + + + + org.scala-lang.modules + scala-java8-compat_2.11 + 1.0.2 + + + + org.scala-lang.modules + scala-collection-compat_2.11 + 2.8.0 + + org.apache.spark spark-core_2.11 @@ -51,9 +75,8 @@ - eu.dnetlib.dhp - dhp-common - ${project.version} + org.apache.spark + spark-graphx_2.11 @@ -68,16 +91,6 @@ jaxen jaxen - - - - eu.dnetlib - dnet-pace-core - - - org.apache.spark - spark-graphx_2.11 - com.fasterxml.jackson.core jackson-databind diff --git a/dhp-workflows/dhp-graph-provision/pom.xml b/dhp-workflows/dhp-graph-provision/pom.xml index ae8f3b53a..413cc8cdd 100644 --- a/dhp-workflows/dhp-graph-provision/pom.xml +++ b/dhp-workflows/dhp-graph-provision/pom.xml @@ -78,7 +78,7 @@ org.antlr - stringtemplate + ST4 org.apache.solr diff --git a/pom.xml b/pom.xml index db86c1db3..0f365a79b 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,7 @@ dhp-build + dhp-pace-core dhp-common dhp-workflows @@ -105,6 +106,12 @@ false + + dnet-deps + dnet-dependencies + https://maven.d4science.org/nexus/content/repositories/dnet-deps + default + @@ -381,11 +388,6 @@ - - eu.dnetlib - dnet-pace-core - ${dnet-pace-core.version} - eu.dnetlib cnr-rmi-api @@ -444,7 +446,13 @@ org.antlr stringtemplate - 4.0 + 3.2.1 + + + + org.antlr + ST4 + 4.3.4 @@ -537,6 +545,61 @@ 4.8.71 + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + provided + + + com.fasterxml.jackson.module + jackson-module-jsonSchema + ${jackson.version} + provided + + + + + org.apache.commons + commons-math3 + 3.6.1 + + + + + com.google.code.gson + gson + ${google.gson.version} + + + + commons-collections + commons-collections + ${commons.collections.version} + + + commons-logging + commons-logging + ${commons.logging.version} + + + + org.reflections + reflections + 0.9.10 + + + + org.scala-lang + scala-library + ${scala.version} + + + + com.ibm.icu + icu4j + 70.1 + @@ -614,7 +677,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.0.0 + 3.6.0 @@ -811,7 +874,6 @@ [4.0.3] [6.0.5] [3.1.6] - [4.1.12] [2.6.1] 7.5.0 4.7.2 @@ -823,5 +885,8 @@ 1.8 4.5.3 4.0.1 + 2.2.2 + 1.1.3 + 3.2.1 \ No newline at end of file