diff --git a/dhp-pace-core/pom.xml b/dhp-pace-core/pom.xml index 2b72fc576..fac087ac7 100644 --- a/dhp-pace-core/pom.xml +++ b/dhp-pace-core/pom.xml @@ -68,7 +68,6 @@ commons-io commons-io - org.antlr stringtemplate @@ -77,12 +76,6 @@ commons-logging commons-logging - - - org.junit.jupiter - junit-jupiter - test - org.reflections reflections @@ -95,32 +88,22 @@ org.apache.commons commons-math3 - com.jayway.jsonpath json-path - com.ibm.icu icu4j - - - org.antlr - stringtemplate - 3.2.1 - org.apache.spark spark-core_2.11 - org.apache.spark spark-sql_2.11 - diff --git a/dhp-pace-core/src/main/java/eu/dnetlib/pace/config/DedupConfig.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/config/DedupConfig.java index eeec68ae6..ac0ef08e4 100644 --- a/dhp-pace-core/src/main/java/eu/dnetlib/pace/config/DedupConfig.java +++ b/dhp-pace-core/src/main/java/eu/dnetlib/pace/config/DedupConfig.java @@ -17,8 +17,6 @@ import java.util.stream.Collectors; import org.antlr.stringtemplate.StringTemplate; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/dhp-workflows/dhp-dedup-openaire/pom.xml b/dhp-workflows/dhp-dedup-openaire/pom.xml index a6e34bb96..750cc7028 100644 --- a/dhp-workflows/dhp-dedup-openaire/pom.xml +++ b/dhp-workflows/dhp-dedup-openaire/pom.xml @@ -87,6 +87,11 @@ spark-sql_2.11 + + org.apache.spark + spark-graphx_2.11 + + com.arakelian java-jq @@ -102,15 +107,6 @@ jaxen - - org.apache.spark - spark-graphx_2.11 - - - org.apache.spark - spark-sql_2.11 - - com.influxdb influxdb-client-java 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 eb0ee4466..4707f7d01 100644 --- a/pom.xml +++ b/pom.xml @@ -451,7 +451,13 @@ org.antlr stringtemplate - 4.0 + 3.2.1 + + + + org.antlr + ST4 + 4.3.4 @@ -544,170 +550,61 @@ 4.8.71 - - edu.cmu - secondstring - 1.0.0 - - - org.antlr - stringtemplate - 3.2 - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson.version} - provided - - - com.fasterxml.jackson.module - jackson-module-jsonSchema - ${jackson.version} - provided - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - provided - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - provided - - - - org.mockito - mockito-core - ${mockito-core.version} - test - - - - org.mockito - mockito-junit-jupiter - ${mockito-core.version} - test - - - - org.apache.commons - commons-math3 - 3.6.1 - - - - com.google.guava - guava - ${google.guava.version} - - - com.google.code.gson - gson - ${google.gson.version} - - - - org.apache.commons - commons-lang3 - ${commons.lang.version} - - - - commons-io - commons-io - ${commons.io.version} - - - commons-collections - commons-collections - ${commons.collections.version} - - - commons-logging - commons-logging - ${commons.logging.version} - - - org.apache.spark - spark-core_2.11 - ${spark.version} - provided - - - org.apache.spark - spark-graphx_2.11 - ${spark.version} - provided - - - org.apache.spark - spark-sql_2.11 - ${spark.version} - provided - - - - org.junit.jupiter - junit-jupiter - ${junit-jupiter.version} - test - - - - org.reflections - reflections - 0.9.10 - - - - org.scala-lang - scala-library - ${scala.version} - - - - org.apache.oozie - oozie-client - 5.1.0 - - - com.jayway.jsonpath - json-path - 2.4.0 - - - - org.mockito - mockito-core - 3.3.3 - test - - - - org.mockito - mockito-junit-jupiter - 3.3.3 - test - - - - com.ibm.icu - icu4j - 70.1 - + + 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 +