diff --git a/iis-common/pom.xml b/iis-common/pom.xml index 8e8b786f9..1ec04d597 100644 --- a/iis-common/pom.xml +++ b/iis-common/pom.xml @@ -79,22 +79,22 @@ org.apache.spark - spark-core_2.11 + spark-core_2.12 org.apache.spark - spark-sql_2.11 + spark-sql_2.12 org.apache.spark - spark-avro_2.11 + spark-avro_2.12 pl.edu.icm.spark-utils - spark-utils_2.11 + spark-utils_2.12 diff --git a/iis-wf/iis-wf-affmatching/pom.xml b/iis-wf/iis-wf-affmatching/pom.xml index b74b5e6a8..8ea3863e4 100644 --- a/iis-wf/iis-wf-affmatching/pom.xml +++ b/iis-wf/iis-wf-affmatching/pom.xml @@ -35,17 +35,17 @@ org.apache.spark - spark-core_2.11 + spark-core_2.12 org.apache.spark - spark-sql_2.11 + spark-sql_2.12 pl.edu.icm.spark-utils - spark-utils_2.11 + spark-utils_2.12 diff --git a/iis-wf/iis-wf-citationmatching-direct/pom.xml b/iis-wf/iis-wf-citationmatching-direct/pom.xml index c24e9043f..85e856684 100644 --- a/iis-wf/iis-wf-citationmatching-direct/pom.xml +++ b/iis-wf/iis-wf-citationmatching-direct/pom.xml @@ -36,17 +36,17 @@ org.apache.spark - spark-core_2.11 + spark-core_2.12 org.apache.spark - spark-sql_2.11 + spark-sql_2.12 pl.edu.icm.spark-utils - spark-utils_2.11 + spark-utils_2.12 diff --git a/iis-wf/iis-wf-citationmatching/pom.xml b/iis-wf/iis-wf-citationmatching/pom.xml index fdeebae2d..3cbe12031 100644 --- a/iis-wf/iis-wf-citationmatching/pom.xml +++ b/iis-wf/iis-wf-citationmatching/pom.xml @@ -18,6 +18,28 @@ eu.dnetlib.iis iis-common ${project.version} + + + + org.scala-lang + scala-library + + + + org.apache.spark + spark-core_2.12 + + + + org.apache.spark + spark-sql_2.12 + + + + pl.edu.icm.spark-utils + spark-utils_2.12 + + @@ -38,6 +60,28 @@ ${project.version} test-jar test + + + + org.scala-lang + scala-library + + + + org.apache.spark + spark-core_2.12 + + + + org.apache.spark + spark-sql_2.12 + + + + pl.edu.icm.spark-utils + spark-utils_2.12 + + diff --git a/iis-wf/iis-wf-documentsclassification/pom.xml b/iis-wf/iis-wf-documentsclassification/pom.xml index b084b27a5..0a499a20c 100644 --- a/iis-wf/iis-wf-documentsclassification/pom.xml +++ b/iis-wf/iis-wf-documentsclassification/pom.xml @@ -53,17 +53,17 @@ org.apache.spark - spark-core_2.11 + spark-core_2.12 org.apache.spark - spark-sql_2.11 + spark-sql_2.12 pl.edu.icm.spark-utils - spark-utils_2.11 + spark-utils_2.12 diff --git a/iis-wf/iis-wf-documentssimilarity/pom.xml b/iis-wf/iis-wf-documentssimilarity/pom.xml index 7f2280e03..f91b992c8 100644 --- a/iis-wf/iis-wf-documentssimilarity/pom.xml +++ b/iis-wf/iis-wf-documentssimilarity/pom.xml @@ -53,13 +53,13 @@ org.apache.spark - spark-core_2.11 + spark-core_2.12 test org.apache.spark - spark-sql_2.11 + spark-sql_2.12 test diff --git a/iis-wf/iis-wf-export-actionmanager/pom.xml b/iis-wf/iis-wf-export-actionmanager/pom.xml index 9025e5ffc..e4e44a175 100644 --- a/iis-wf/iis-wf-export-actionmanager/pom.xml +++ b/iis-wf/iis-wf-export-actionmanager/pom.xml @@ -76,22 +76,22 @@ org.apache.spark - spark-core_2.11 + spark-core_2.12 org.apache.spark - spark-sql_2.11 + spark-sql_2.12 org.apache.spark - spark-avro_2.11 + spark-avro_2.12 pl.edu.icm.spark-utils - spark-utils_2.11 + spark-utils_2.12 diff --git a/iis-wf/iis-wf-import/pom.xml b/iis-wf/iis-wf-import/pom.xml index f6c86dac2..35f8f4b43 100644 --- a/iis-wf/iis-wf-import/pom.xml +++ b/iis-wf/iis-wf-import/pom.xml @@ -115,27 +115,27 @@ org.apache.spark - spark-core_2.11 + spark-core_2.12 org.apache.spark - spark-sql_2.11 + spark-sql_2.12 pl.edu.icm.spark-utils - spark-utils_2.11 + spark-utils_2.12 org.apache.spark - spark-avro_2.11 + spark-avro_2.12 org.apache.spark - spark-hive_2.11 + spark-hive_2.12 diff --git a/iis-wf/iis-wf-referenceextraction/pom.xml b/iis-wf/iis-wf-referenceextraction/pom.xml index a58252eae..3cb57c26f 100644 --- a/iis-wf/iis-wf-referenceextraction/pom.xml +++ b/iis-wf/iis-wf-referenceextraction/pom.xml @@ -66,22 +66,22 @@ org.apache.spark - spark-core_2.11 + spark-core_2.12 org.apache.spark - spark-sql_2.11 + spark-sql_2.12 org.apache.spark - spark-avro_2.11 + spark-avro_2.12 pl.edu.icm.spark-utils - spark-utils_2.11 + spark-utils_2.12 diff --git a/iis-wf/iis-wf-transformers/pom.xml b/iis-wf/iis-wf-transformers/pom.xml index a6dbef295..8a332aeff 100644 --- a/iis-wf/iis-wf-transformers/pom.xml +++ b/iis-wf/iis-wf-transformers/pom.xml @@ -51,17 +51,17 @@ org.apache.spark - spark-core_2.11 + spark-core_2.12 org.apache.spark - spark-sql_2.11 + spark-sql_2.12 pl.edu.icm.spark-utils - spark-utils_2.11 + spark-utils_2.12 diff --git a/pom.xml b/pom.xml index 91f5813d5..5032949b5 100644 --- a/pom.xml +++ b/pom.xml @@ -321,36 +321,36 @@ org.apache.spark - spark-core_2.11 + spark-core_2.12 ${iis.spark.version} provided org.apache.spark - spark-sql_2.11 + spark-sql_2.12 ${iis.spark.version} provided org.apache.spark - spark-avro_2.11 + spark-avro_2.12 ${iis.spark.version} provided org.apache.spark - spark-hive_2.11 + spark-hive_2.12 ${iis.spark.version} provided pl.edu.icm.spark-utils - spark-utils_2.11 - 1.0.1 + spark-utils_2.12 + 1.0.2 provided @@ -1017,7 +1017,7 @@ 0.12.0-${iis.cdh.version} 1.7.6-${iis.cdh.version} 2.6.0-${iis.cdh.version} - 2.4.0.cloudera2 + 3.4.1 1.10 5.8.2