diff --git a/dhp-common/pom.xml b/dhp-common/pom.xml
index a7a83821e7..6198bd81ee 100644
--- a/dhp-common/pom.xml
+++ b/dhp-common/pom.xml
@@ -52,6 +52,8 @@
+ true
+ ${scala.binary.version}
${scala.version}
@@ -81,11 +83,11 @@
org.apache.spark
- spark-core_2.11
+ spark-core_${scala.binary.version}
org.apache.spark
- spark-sql_2.11
+ spark-sql_${scala.binary.version}
@@ -159,7 +161,7 @@
eu.dnetlib.dhp
- dhp-schemas
+ ${dhp-schemas.artifact}
diff --git a/dhp-pace-core/pom.xml b/dhp-pace-core/pom.xml
index 12174a5c5b..fd7f44fc94 100644
--- a/dhp-pace-core/pom.xml
+++ b/dhp-pace-core/pom.xml
@@ -20,7 +20,7 @@
net.alchim31.maven
scala-maven-plugin
- 4.0.1
+ ${net.alchim31.maven.version}
scala-compile-first
@@ -39,8 +39,9 @@
+ true
+ ${scala.binary.version}
${scala.version}
- -target:jvm-1.8
@@ -68,7 +69,6 @@
commons-io
commons-io
-
org.antlr
stringtemplate
@@ -89,17 +89,22 @@
org.apache.commons
commons-math3
-
com.jayway.jsonpath
json-path
-
com.ibm.icu
icu4j
-
+
+ org.apache.spark
+ spark-core_${scala.binary.version}
+
+
+ org.apache.spark
+ spark-sql_${scala.binary.version}
+
diff --git a/dhp-pace-core/src/main/java/eu/dnetlib/pace/util/DiffPatchMatch.java b/dhp-pace-core/src/main/java/eu/dnetlib/pace/util/DiffPatchMatch.java
index 84d49bd5ca..12c96500e4 100644
--- a/dhp-pace-core/src/main/java/eu/dnetlib/pace/util/DiffPatchMatch.java
+++ b/dhp-pace-core/src/main/java/eu/dnetlib/pace/util/DiffPatchMatch.java
@@ -1,6 +1,24 @@
package eu.dnetlib.pace.util;
+/*
+ * Diff Match and Patch
+ * Copyright 2018 The diff-match-patch Authors.
+ * https://github.com/google/diff-match-patch
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
/*
* Diff Match and Patch
* Copyright 2018 The diff-match-patch Authors.
diff --git a/dhp-workflows/dhp-actionmanager/pom.xml b/dhp-workflows/dhp-actionmanager/pom.xml
index 29e1fab1ff..ce13502b6f 100644
--- a/dhp-workflows/dhp-actionmanager/pom.xml
+++ b/dhp-workflows/dhp-actionmanager/pom.xml
@@ -11,12 +11,12 @@
org.apache.spark
- spark-core_2.11
+ spark-core_${scala.binary.version}
org.apache.spark
- spark-sql_2.11
+ spark-sql_${scala.binary.version}
diff --git a/dhp-workflows/dhp-aggregation/pom.xml b/dhp-workflows/dhp-aggregation/pom.xml
index 53d349d2a1..108d25ba63 100644
--- a/dhp-workflows/dhp-aggregation/pom.xml
+++ b/dhp-workflows/dhp-aggregation/pom.xml
@@ -38,6 +38,8 @@
+ true
+ ${scala.binary.version}
${scala.version}
@@ -54,11 +56,11 @@
org.apache.spark
- spark-core_2.11
+ spark-core_${scala.binary.version}
org.apache.spark
- spark-sql_2.11
+ spark-sql_${scala.binary.version}
@@ -75,6 +77,11 @@
dom4j
dom4j
+
+ org.scala-lang.modules
+ scala-xml_${scala.binary.version}
+ ${scala-xml.version}
+
xml-apis
diff --git a/dhp-workflows/dhp-blacklist/pom.xml b/dhp-workflows/dhp-blacklist/pom.xml
index 479a9e8c63..7ecc8b35d2 100644
--- a/dhp-workflows/dhp-blacklist/pom.xml
+++ b/dhp-workflows/dhp-blacklist/pom.xml
@@ -16,11 +16,11 @@
org.apache.spark
- spark-core_2.11
+ spark-core_${scala.binary.version}
org.apache.spark
- spark-sql_2.11
+ spark-sql_${scala.binary.version}
diff --git a/dhp-workflows/dhp-broker-events/pom.xml b/dhp-workflows/dhp-broker-events/pom.xml
index 01f1ea3211..322fc7e93d 100644
--- a/dhp-workflows/dhp-broker-events/pom.xml
+++ b/dhp-workflows/dhp-broker-events/pom.xml
@@ -18,11 +18,11 @@
org.apache.spark
- spark-core_2.11
+ spark-core_${scala.binary.version}
org.apache.spark
- spark-sql_2.11
+ spark-sql_${scala.binary.version}
org.elasticsearch
diff --git a/dhp-workflows/dhp-dedup-openaire/pom.xml b/dhp-workflows/dhp-dedup-openaire/pom.xml
index af4511c3c8..a271efe8e4 100644
--- a/dhp-workflows/dhp-dedup-openaire/pom.xml
+++ b/dhp-workflows/dhp-dedup-openaire/pom.xml
@@ -13,7 +13,7 @@
net.alchim31.maven
scala-maven-plugin
- 4.0.1
+ ${net.alchim31.maven.version}
scala-compile-first
@@ -32,6 +32,8 @@
+ true
+ ${scala.binary.version}
${scala.version}
@@ -53,30 +55,35 @@
${project.version}
+
+ org.apache.commons
+ commons-lang3
+
+
org.scala-lang.modules
- scala-java8-compat_2.11
+ scala-java8-compat_${scala.binary.version}
1.0.2
org.scala-lang.modules
- scala-collection-compat_2.11
- 2.8.0
+ scala-collection-compat_${scala.binary.version}
+ 2.11.0
org.apache.spark
- spark-core_2.11
+ spark-core_${scala.binary.version}
org.apache.spark
- spark-sql_2.11
+ spark-sql_${scala.binary.version}
org.apache.spark
- spark-graphx_2.11
+ spark-graphx_${scala.binary.version}
diff --git a/dhp-workflows/dhp-doiboost/pom.xml b/dhp-workflows/dhp-doiboost/pom.xml
index 37accbc4f5..6e8911fbab 100644
--- a/dhp-workflows/dhp-doiboost/pom.xml
+++ b/dhp-workflows/dhp-doiboost/pom.xml
@@ -33,6 +33,8 @@
+ true
+ ${scala.binary.version}
${scala.version}
@@ -70,12 +72,12 @@
org.apache.spark
- spark-core_2.11
+ spark-core_${scala.binary.version}
org.apache.spark
- spark-sql_2.11
+ spark-sql_${scala.binary.version}
diff --git a/dhp-workflows/dhp-enrichment/pom.xml b/dhp-workflows/dhp-enrichment/pom.xml
index 591cad252c..9698dee03c 100644
--- a/dhp-workflows/dhp-enrichment/pom.xml
+++ b/dhp-workflows/dhp-enrichment/pom.xml
@@ -12,11 +12,11 @@
org.apache.spark
- spark-core_2.11
+ spark-core_${scala.binary.version}
org.apache.spark
- spark-sql_2.11
+ spark-sql_${scala.binary.version}
@@ -27,7 +27,7 @@
org.apache.spark
- spark-hive_2.11
+ spark-hive_${scala.binary.version}
test
diff --git a/dhp-workflows/dhp-graph-mapper/pom.xml b/dhp-workflows/dhp-graph-mapper/pom.xml
index f579a7d2bf..ef35951c00 100644
--- a/dhp-workflows/dhp-graph-mapper/pom.xml
+++ b/dhp-workflows/dhp-graph-mapper/pom.xml
@@ -14,7 +14,7 @@
net.alchim31.maven
scala-maven-plugin
- 4.0.1
+ ${net.alchim31.maven.version}
scala-compile-first
@@ -37,6 +37,8 @@
-Xmax-classfile-name
200
+ true
+ ${scala.binary.version}
${scala.version}
@@ -64,15 +66,15 @@
org.apache.spark
- spark-core_2.11
+ spark-core_${scala.binary.version}
org.apache.spark
- spark-sql_2.11
+ spark-sql_${scala.binary.version}
org.apache.spark
- spark-hive_2.11
+ spark-hive_${scala.binary.version}
test
@@ -125,7 +127,7 @@
org.json4s
- json4s-jackson_2.11
+ json4s-jackson_${scala.binary.version}
diff --git a/dhp-workflows/dhp-graph-provision/pom.xml b/dhp-workflows/dhp-graph-provision/pom.xml
index 413cc8cdd6..e62fcdf198 100644
--- a/dhp-workflows/dhp-graph-provision/pom.xml
+++ b/dhp-workflows/dhp-graph-provision/pom.xml
@@ -14,7 +14,7 @@
net.alchim31.maven
scala-maven-plugin
- 4.0.1
+ ${net.alchim31.maven.version}
scala-compile-first
@@ -37,6 +37,8 @@
-Xmax-classfile-name
200
+ true
+ ${scala.binary.version}
${scala.version}
@@ -48,11 +50,11 @@
org.apache.spark
- spark-core_2.11
+ spark-core_${scala.binary.version}
org.apache.spark
- spark-sql_2.11
+ spark-sql_${scala.binary.version}
com.jayway.jsonpath
diff --git a/dhp-workflows/dhp-stats-promote/pom.xml b/dhp-workflows/dhp-stats-promote/pom.xml
index ce3e739a5c..9e17a78dcb 100644
--- a/dhp-workflows/dhp-stats-promote/pom.xml
+++ b/dhp-workflows/dhp-stats-promote/pom.xml
@@ -10,11 +10,11 @@
org.apache.spark
- spark-core_2.11
+ spark-core_${scala.binary.version}
org.apache.spark
- spark-sql_2.11
+ spark-sql_${scala.binary.version}
diff --git a/dhp-workflows/dhp-stats-update/pom.xml b/dhp-workflows/dhp-stats-update/pom.xml
index 2bc610c420..f491b58689 100644
--- a/dhp-workflows/dhp-stats-update/pom.xml
+++ b/dhp-workflows/dhp-stats-update/pom.xml
@@ -10,11 +10,11 @@
org.apache.spark
- spark-core_2.11
+ spark-core_${scala.binary.version}
org.apache.spark
- spark-sql_2.11
+ spark-sql_${scala.binary.version}
diff --git a/dhp-workflows/dhp-usage-raw-data-update/pom.xml b/dhp-workflows/dhp-usage-raw-data-update/pom.xml
index 954c8bd39b..a9dbb09ae1 100644
--- a/dhp-workflows/dhp-usage-raw-data-update/pom.xml
+++ b/dhp-workflows/dhp-usage-raw-data-update/pom.xml
@@ -46,13 +46,11 @@
org.apache.spark
- spark-core_2.11
- 2.2.0
+ spark-core_${scala.binary.version}
org.apache.spark
- spark-sql_2.11
- 2.4.5
+ spark-sql_${scala.binary.version}
com.googlecode.json-simple
diff --git a/dhp-workflows/dhp-usage-stats-build/pom.xml b/dhp-workflows/dhp-usage-stats-build/pom.xml
index 54e18580b3..56aec73b78 100644
--- a/dhp-workflows/dhp-usage-stats-build/pom.xml
+++ b/dhp-workflows/dhp-usage-stats-build/pom.xml
@@ -46,13 +46,11 @@
org.apache.spark
- spark-core_2.11
- 2.2.0
+ spark-core_${scala.binary.version}
org.apache.spark
- spark-sql_2.11
- 2.4.5
+ spark-sql_${scala.binary.version}
com.googlecode.json-simple
diff --git a/pom.xml b/pom.xml
index 0f365a79b8..c6b65e27ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
eu.dnetlib.dhp
- dhp-schemas
+ ${dhp-schemas.artifact}
${dhp-schemas.version}
@@ -171,25 +171,25 @@
org.apache.spark
- spark-core_2.11
+ spark-core_${scala.binary.version}
${dhp.spark.version}
provided
org.apache.spark
- spark-sql_2.11
+ spark-sql_${scala.binary.version}
${dhp.spark.version}
provided
org.apache.spark
- spark-graphx_2.11
+ spark-graphx_${scala.binary.version}
${dhp.spark.version}
provided
org.apache.spark
- spark-hive_2.11
+ spark-hive_${scala.binary.version}
${dhp.spark.version}
test
@@ -295,7 +295,7 @@
com.lucidworks.spark
spark-solr
- 3.6.0
+ ${sparksolr.version}
*
@@ -518,7 +518,7 @@
org.json4s
- json4s-jackson_2.11
+ json4s-jackson_${scala.binary.version}
${json4s.version}
@@ -610,7 +610,11 @@
target/test-classes
-
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+ 3.3
+
org.apache.maven.plugins
maven-project-info-reports-plugin
@@ -694,7 +698,7 @@
org.antipathy
- mvn-scalafmt_2.11
+ mvn-scalafmt_${scala.binary.version}
1.0.1640073709.733712b
@@ -751,7 +755,7 @@
org.antipathy
- mvn-scalafmt_2.11
+ mvn-scalafmt_${scala.binary.version}
https://code-repo.d4science.org/D-Net/dnet-hadoop/raw/branch/beta/dhp-build/dhp-code-style/src/main/resources/scalafmt/scalafmt.conf
false
@@ -860,12 +864,16 @@
cdh5.9.2
2.6.0-${dhp.cdh.version}
4.1.0-${dhp.cdh.version}
+ dhp-schemas
+ 3.6.0
2.4.0.cloudera2
2.9.6
3.5
true
11.0.2
2.11.12
+ 2.11
+ 1.3.0
5.6.1
3.3.3
3.4.2
@@ -889,4 +897,29 @@
1.1.3
3.2.1
+
+
+
+
+ scala-2.12
+
+ 2.12
+ 2.12.18
+
+
+
+ 4.0.2
+ 3.4.1
+ 2.14.2
+ 3.12.0
+ 3.7.0-M11
+ 4.8.1
+
+
+
+
+
\ No newline at end of file