diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/common/PacePerson.java b/dhp-common/src/main/java/eu/dnetlib/dhp/common/PacePerson.java
index fac9a7565..fbf586f8c 100644
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/common/PacePerson.java
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/common/PacePerson.java
@@ -38,7 +38,7 @@ public class PacePerson {
 					PacePerson.class
 						.getResourceAsStream(
 							"/eu/dnetlib/dhp/common/name_particles.txt")));
-		} catch (IOException e) {
+		} catch (Exception e) {
 			throw new RuntimeException(e);
 		}
 	}
diff --git a/dhp-pace-core/pom.xml b/dhp-pace-core/pom.xml
index a6d2538f2..6449b7ec8 100644
--- a/dhp-pace-core/pom.xml
+++ b/dhp-pace-core/pom.xml
@@ -24,7 +24,7 @@
 				<executions>
 					<execution>
 						<id>scala-compile-first</id>
-						<phase>initialize</phase>
+						<phase>process-resources</phase>
 						<goals>
 							<goal>add-source</goal>
 							<goal>compile</goal>
@@ -95,4 +95,90 @@
 		</dependency>
 	</dependencies>
 
+	<profiles>
+		<profile>
+			<id>spark-24</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>build-helper-maven-plugin</artifactId>
+						<version>3.4.0</version>
+						<executions>
+							<execution>
+								<phase>generate-sources</phase>
+								<goals>
+									<goal>add-source</goal>
+								</goals>
+								<configuration>
+									<sources>
+										<source>src/main/spark-2</source>
+									</sources>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<profile>
+			<id>spark-34</id>
+
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>build-helper-maven-plugin</artifactId>
+						<version>3.4.0</version>
+						<executions>
+							<execution>
+								<phase>generate-sources</phase>
+								<goals>
+									<goal>add-source</goal>
+								</goals>
+								<configuration>
+									<sources>
+										<source>src/main/spark-2</source>
+									</sources>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<profile>
+			<id>spark-35</id>
+
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>build-helper-maven-plugin</artifactId>
+						<version>3.4.0</version>
+						<executions>
+							<execution>
+								<phase>generate-sources</phase>
+								<goals>
+									<goal>add-source</goal>
+								</goals>
+								<configuration>
+									<sources>
+										<source>src/main/spark-35</source>
+									</sources>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
 </project>
diff --git a/dhp-pace-core/src/main/java/eu/dnetlib/pace/model/SparkModel.scala b/dhp-pace-core/src/main/java/eu/dnetlib/pace/model/SparkModel.scala
index 95325ace0..d67860a3d 100644
--- a/dhp-pace-core/src/main/java/eu/dnetlib/pace/model/SparkModel.scala
+++ b/dhp-pace-core/src/main/java/eu/dnetlib/pace/model/SparkModel.scala
@@ -2,11 +2,10 @@ package eu.dnetlib.pace.model
 
 import com.jayway.jsonpath.{Configuration, JsonPath}
 import eu.dnetlib.pace.config.{DedupConfig, Type}
-import eu.dnetlib.pace.util.MapDocumentUtil
-import org.apache.spark.sql.catalyst.encoders.RowEncoder
+import eu.dnetlib.pace.util.{MapDocumentUtil, SparkCompatUtils}
+import org.apache.spark.sql.{Dataset, Row}
 import org.apache.spark.sql.catalyst.expressions.GenericRowWithSchema
 import org.apache.spark.sql.types.{DataTypes, Metadata, StructField, StructType}
-import org.apache.spark.sql.{Dataset, Row}
 
 import java.util.regex.Pattern
 import scala.collection.JavaConverters._
@@ -48,8 +47,8 @@ case class SparkModel(conf: DedupConfig) {
 
   val orderingFieldPosition: Int = schema.fieldIndex(orderingFieldName)
 
-  val parseJsonDataset: (Dataset[String] => Dataset[Row]) = df => {
-    df.map(r => rowFromJson(r))(RowEncoder(schema))
+   val parseJsonDataset: (Dataset[String] => Dataset[Row]) = df => {
+    df.map(r => rowFromJson(r))(SparkCompatUtils.encoderFor(schema))
   }
 
   def rowFromJson(json: String): Row = {
diff --git a/dhp-pace-core/src/main/spark-2/eu/dnetlib/pace/util/SparkCompatUtils.scala b/dhp-pace-core/src/main/spark-2/eu/dnetlib/pace/util/SparkCompatUtils.scala
new file mode 100644
index 000000000..a426703d6
--- /dev/null
+++ b/dhp-pace-core/src/main/spark-2/eu/dnetlib/pace/util/SparkCompatUtils.scala
@@ -0,0 +1,12 @@
+package eu.dnetlib.pace.util
+
+import org.apache.spark.sql.Row
+import org.apache.spark.sql.catalyst.encoders.{ExpressionEncoder, RowEncoder}
+import org.apache.spark.sql.types.StructType
+
+object SparkCompatUtils {
+
+  def encoderFor(schema: StructType): ExpressionEncoder[Row] = {
+    RowEncoder(schema)
+  }
+}
\ No newline at end of file
diff --git a/dhp-pace-core/src/main/spark-35/eu/dnetlib/pace/util/SparkCompatUtils.scala b/dhp-pace-core/src/main/spark-35/eu/dnetlib/pace/util/SparkCompatUtils.scala
new file mode 100644
index 000000000..cbc454ae2
--- /dev/null
+++ b/dhp-pace-core/src/main/spark-35/eu/dnetlib/pace/util/SparkCompatUtils.scala
@@ -0,0 +1,12 @@
+package eu.dnetlib.pace.util
+
+import org.apache.spark.sql.Row
+import org.apache.spark.sql.catalyst.encoders.ExpressionEncoder
+import org.apache.spark.sql.types.StructType
+
+object SparkCompatUtils {
+
+  def encoderFor(schema: StructType): ExpressionEncoder[Row] = {
+    ExpressionEncoder(schema)
+  }
+}
diff --git a/dhp-workflows/dhp-graph-provision/pom.xml b/dhp-workflows/dhp-graph-provision/pom.xml
index 60c925227..4b4e6c1c4 100644
--- a/dhp-workflows/dhp-graph-provision/pom.xml
+++ b/dhp-workflows/dhp-graph-provision/pom.xml
@@ -162,6 +162,18 @@
                     <artifactId>antlr4-runtime</artifactId>
                     <groupId>org.antlr</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>woodstox-core</artifactId>
+                    <groupId>com.fasterxml.woodstox</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>log4j</artifactId>
+                    <groupId>*</groupId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -210,7 +222,7 @@
 
     <profiles>
         <profile>
-            <id>scala-2.11</id>
+            <id>spark-24</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
@@ -240,7 +252,7 @@
         </profile>
 
         <profile>
-            <id>scala-2.12</id>
+            <id>spark-34</id>
 
             <build>
                 <plugins>
@@ -266,6 +278,32 @@
             </build>
         </profile>
 
+        <profile>
+            <id>spark-35</id>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <version>3.4.0</version>
+                        <executions>
+                            <execution>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>src/main/sparksolr-4</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1480af2a6..d7d7a6ca9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -233,6 +233,13 @@
                 <scope>provided</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-log4j12</artifactId>
+                <version>${org.slf4j.version}</version>
+                <scope>provided</scope>
+            </dependency>
+
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jcl-over-slf4j</artifactId>
@@ -240,6 +247,28 @@
                 <scope>provided</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-slf4j2-impl</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-api</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-core</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+            <dependency>
+                <!-- API bridge between log4j 1 and 2 -->
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-1.2-api</artifactId>
+                <version>${log4j.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
@@ -381,7 +410,7 @@
             <dependency>
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
-                <version>3.4.11</version>
+                <version>${zookeeper.version}</version>
             </dependency>
 
             <dependency>
@@ -713,6 +742,7 @@
                     <version>3.0.0-M4</version>
                     <configuration>
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                        <trimStackTrace>false</trimStackTrace>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -945,6 +975,7 @@
         <dnet-actionmanager-common.version>[6.0.5]</dnet-actionmanager-common.version>
         <dnet-openaire-broker-common.version>[3.1.6]</dnet-openaire-broker-common.version>
         <google.gson.version>2.2.2</google.gson.version>
+        <log4j.version>1.2.17</log4j.version>
         <javassist.version>3.19.0-GA</javassist.version>
         <json4s.version>3.5.3</json4s.version>
         <jsonschemagenerator.version>4.13.0</jsonschemagenerator.version>
@@ -960,12 +991,13 @@
         <sparksolr.version>3.6.0</sparksolr.version>
         <unidecode.version>0.0.7</unidecode.version>
         <vtd.version>[2.12,3.0)</vtd.version>
+        <zookeeper.version>3.4.6</zookeeper.version>
     </properties>
 
     <!-- Build with scala 12 and Spark 3.4 -->
     <profiles>
         <profile>
-            <id>scala-2.12</id>
+            <id>spark-34</id>
             <properties>
                 <scala.binary.version>2.12</scala.binary.version>
                 <scala.version>2.12.18</scala.version>
@@ -991,11 +1023,13 @@
                 <dhp.spark.version>3.4.2.openaire-SNAPSHOT</dhp.spark.version>
                 <dhp.jackson.version>2.14.2</dhp.jackson.version>
                 <dhp.commons.lang.version>3.12.0</dhp.commons.lang.version>
+                <log4j.version>2.19.0</log4j.version>
                 <json4s.version>3.7.0-M11</json4s.version>
                 <javassist.version>3.25.0-GA</javassist.version>
                 <okhttp.version>4.10.0</okhttp.version>
                 <org.slf4j.version>2.0.6</org.slf4j.version>
                 <reflections.version>0.10.2</reflections.version>
+                <zookeeper.version>3.6.3</zookeeper.version>
                 <!--
                 <dhp-schemas.artifact>dhp-schemas_${scala.binary.version}</dhp-schemas.artifact>
                 <dhp-schemas.version>3.17.2-SNAPSHOT</dhp-schemas.version>
@@ -1004,9 +1038,50 @@
         </profile>
 
         <profile>
-            <id>java17</id>
+            <id>spark-35</id>
+            <properties>
+                <scala.binary.version>2.12</scala.binary.version>
+                <scala.version>2.12.18</scala.version>
+                <scala-xml.version>1.3.0</scala-xml.version>
+
+                <!-- plugin versions -->
+                <net.alchim31.maven.version>4.8.1</net.alchim31.maven.version>
+
+                <!-- dependencies -->
+                <common.compress.version>1.23.0</common.compress.version>
+                <common.csv.version>1.8</common.csv.version>
+                <common.text.version>1.10.0</common.text.version>
+                <commons-beanutils.version>1.9.4</commons-beanutils.version>
+                <commons-codec.version>1.16.0</commons-codec.version>
+                <commons.collections.version>3.2.2</commons.collections.version>
+                <commons-io.version>2.13.0</commons-io.version>
+                <commons.logging.version>1.1.3</commons.logging.version>
+                <commons-validator.version>1.7</commons-validator.version>
+
+                <dhp.guava.version>14.0.1</dhp.guava.version>
+                <solr.version>8.11.0</solr.version>
+                <sparksolr.version>4.0.4</sparksolr.version>
+                <dhp.spark.version>3.5.1.openaire-SNAPSHOT</dhp.spark.version>
+                <dhp.jackson.version>2.15.2</dhp.jackson.version>
+                <dhp.commons.lang.version>3.12.0</dhp.commons.lang.version>
+                <log4j.version>2.20.0</log4j.version>
+                <json4s.version>3.7.0-M11</json4s.version>
+                <javassist.version>3.25.0-GA</javassist.version>
+                <okhttp.version>4.10.0</okhttp.version>
+                <org.slf4j.version>2.0.7</org.slf4j.version>
+                <reflections.version>0.10.2</reflections.version>
+                <zookeeper.version>3.6.3</zookeeper.version>
+                <!--
+                <dhp-schemas.artifact>dhp-schemas_${scala.binary.version}</dhp-schemas.artifact>
+                <dhp-schemas.version>3.17.2-SNAPSHOT</dhp-schemas.version>
+                 -->
+            </properties>
+        </profile>
+
+        <profile>
+            <id>java11</id>
             <activation>
-                <jdk>17</jdk>
+                <jdk>[11</jdk>
             </activation>
             <build>
                 <pluginManagement>
@@ -1031,6 +1106,7 @@
                                     --add-opens=java.base/sun.util.calendar=ALL-UNNAMED
                                 </argLine>
                                 <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                                <trimStackTrace>false</trimStackTrace>
                             </configuration>
                         </plugin>
                     </plugins>