diff --git a/pom.xml b/pom.xml
index c2fb416..17b0000 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,10 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-spring</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-spring-xml</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-core</artifactId>
@@ -96,20 +100,6 @@
             <artifactId>Saxon-HE</artifactId>
             <version>9.8.0-14</version>
         </dependency>
-        <!-- Explicitly add JAXB dependencies. Needed for newer Java versions.
-        See also https://stackoverflow.com/questions/43574426/how-to-resolve-java-lang-noclassdeffounderror-javax-xml-bind-jaxbexception-in-j
-        -->
-        <!-- JAXB version corresponding to version used in Apache Camel -->
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>${jaxb.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.1.1</version>
-        </dependency>
     </dependencies>
     <build>
         <resources>
@@ -126,10 +116,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
             <plugin>
@@ -137,7 +126,7 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.10.1</version>
                 <configuration>
-                    <source>1.8</source>
+                    <source>1.11</source>
                     <minmemory>256m</minmemory>
                     <maxmemory>512m</maxmemory>
                 </configuration>
@@ -187,7 +176,7 @@
                 <plugin>
                     <artifactId>maven-war-plugin</artifactId>
                     <inherited>true</inherited>
-                    <version>2.2</version>
+                    <version>3.2.3</version>
                     <executions>
                         <execution>
                             <phase>package</phase>
@@ -223,11 +212,10 @@
         </pluginManagement>
     </build>
     <properties>
-        <camel.version>2.24.3</camel.version>
-        <jaxb.version>2.3.0</jaxb.version>
-        <spring.version>5.1.19.RELEASE</spring.version>
-        <spring-boot.version>2.1.18.RELEASE</spring-boot.version>
-        <spring-framework.version>${spring.version}</spring-framework.version>
+        <camel.version>3.14.0</camel.version>
+        <spring-boot.version>2.6.1</spring-boot.version>
+
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <oai-pmh.base.url.external>http://localhost:8080/omdf</oai-pmh.base.url.external>
         <oai-pmh.db.item.csw.TYPE>inspire</oai-pmh.db.item.csw.TYPE>
diff --git a/src/main/java/eu/odp/harvest/geo/oai/http/AllowAllHttpClientConfig.java b/src/main/java/eu/odp/harvest/geo/oai/http/AllowAllHttpClientConfig.java
deleted file mode 100644
index c9553c3..0000000
--- a/src/main/java/eu/odp/harvest/geo/oai/http/AllowAllHttpClientConfig.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package eu.odp.harvest.geo.oai.http;
-
-import org.apache.commons.httpclient.protocol.Protocol;
-import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
-
-/**
- * Configures HttpClient that is used for Camel outgoing HTTP connections. Registers an SSL ProtocolSocketFactory that
- * trusts all server certificates.
- * WARNING: Use of this class is insecure, as it basically nullifies the purpose of HTTPS.
- * Do not use it if you need connections to trusted providers.
- */
-public class AllowAllHttpClientConfig {
-    /**
-     * Constructor. Registers the custom ProtocolSocketFactory.
-     */
-    public AllowAllHttpClientConfig() {
-        Protocol easyhttps = new Protocol("https", (ProtocolSocketFactory)new AllowAllSslProtocolSocketFactory(), 443);
-        Protocol.registerProtocol("https", easyhttps);
-    }
-}
diff --git a/src/main/java/eu/odp/harvest/geo/oai/http/AllowAllSslProtocolSocketFactory.java b/src/main/java/eu/odp/harvest/geo/oai/http/AllowAllSslProtocolSocketFactory.java
deleted file mode 100644
index a27f199..0000000
--- a/src/main/java/eu/odp/harvest/geo/oai/http/AllowAllSslProtocolSocketFactory.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package eu.odp.harvest.geo.oai.http;
-
-import org.apache.commons.httpclient.ConnectTimeoutException;
-import org.apache.commons.httpclient.HttpClientError;
-import org.apache.commons.httpclient.params.HttpConnectionParams;
-import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
-
-import javax.net.SocketFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import java.io.IOException;
-import java.net.*;
-
-/**
- * Based on EasySSLProtocolSocketFactory from Apache httpclient-ssl-contrib, but trusts all server certificates, not just
- * self-signed.
- * WARNING: Use of this class is insecure, as it basically nullifies the purpose of HTTPS.
- * Do not use it if you need connections to trusted providers.
- */
-public class AllowAllSslProtocolSocketFactory implements SecureProtocolSocketFactory {
-    private SSLContext sslcontext = null;
-
-    /**
-     * Constructor for AllowAllSslProtocolSocketFactory.
-     */
-    public AllowAllSslProtocolSocketFactory() {
-        super();
-    }
-
-    private static SSLContext createCustomSSLContext() {
-        try {
-            SSLContext context = SSLContext.getInstance("SSL");
-            context.init(
-                    null,
-                    new TrustManager[] {new AllowAllX509TrustManager(null)},
-                    null);
-            return context;
-        } catch (Exception e) {
-            throw new HttpClientError(e.toString());
-        }
-    }
-
-    private SSLContext getSSLContext() {
-        if (this.sslcontext == null) {
-            this.sslcontext = createCustomSSLContext();
-        }
-        return this.sslcontext;
-    }
-
-    /**
-     * @see SecureProtocolSocketFactory#createSocket(java.lang.String,int,java.net.InetAddress,int)
-     */
-    public Socket createSocket(
-            String host,
-            int port,
-            InetAddress clientHost,
-            int clientPort)
-            throws IOException, UnknownHostException {
-
-        return getSSLContext().getSocketFactory().createSocket(
-                host,
-                port,
-                clientHost,
-                clientPort
-        );
-    }
-
-    /**
-     * Attempts to get a new socket connection to the given host within the given time limit.
-     * <p>
-     * To circumvent the limitations of older JREs that do not support connect timeout a
-     * controller thread is executed. The controller thread attempts to create a new socket
-     * within the given limit of time. If socket constructor does not return until the
-     * timeout expires, the controller terminates and throws an {@link ConnectTimeoutException}
-     * </p>
-     *
-     * @param host the host name/IP
-     * @param port the port on the host
-     * @param params {@link HttpConnectionParams Http connection parameters}
-     *
-     * @return Socket a new socket
-     *
-     * @throws IOException if an I/O error occurs while creating the socket
-     * @throws UnknownHostException if the IP address of the host cannot be
-     * determined
-     */
-    public Socket createSocket(
-            final String host,
-            final int port,
-            final InetAddress localAddress,
-            final int localPort,
-            final HttpConnectionParams params
-    ) throws IOException, UnknownHostException, ConnectTimeoutException {
-        if (params == null) {
-            throw new IllegalArgumentException("Parameters may not be null");
-        }
-        int timeout = params.getConnectionTimeout();
-        SocketFactory socketfactory = getSSLContext().getSocketFactory();
-        if (timeout == 0) {
-            return socketfactory.createSocket(host, port, localAddress, localPort);
-        } else {
-            Socket socket = socketfactory.createSocket();
-            SocketAddress localaddr = new InetSocketAddress(localAddress, localPort);
-            SocketAddress remoteaddr = new InetSocketAddress(host, port);
-            socket.bind(localaddr);
-            socket.connect(remoteaddr, timeout);
-            return socket;
-        }
-    }
-
-    /**
-     * @see SecureProtocolSocketFactory#createSocket(java.lang.String,int)
-     */
-    public Socket createSocket(String host, int port)
-            throws IOException, UnknownHostException {
-        return getSSLContext().getSocketFactory().createSocket(
-                host,
-                port
-        );
-    }
-
-    /**
-     * @see SecureProtocolSocketFactory#createSocket(java.net.Socket,java.lang.String,int,boolean)
-     */
-    public Socket createSocket(
-            Socket socket,
-            String host,
-            int port,
-            boolean autoClose)
-            throws IOException, UnknownHostException {
-        return getSSLContext().getSocketFactory().createSocket(
-                socket,
-                host,
-                port,
-                autoClose
-        );
-    }
-
-    public boolean equals(Object obj) {
-        return ((obj != null) && obj.getClass().equals(AllowAllSslProtocolSocketFactory.class));
-    }
-
-    public int hashCode() {
-        return AllowAllSslProtocolSocketFactory.class.hashCode();
-    }
-}
diff --git a/src/main/java/eu/odp/harvest/geo/oai/http/AllowAllX509TrustManager.java b/src/main/java/eu/odp/harvest/geo/oai/http/AllowAllX509TrustManager.java
deleted file mode 100644
index 8191325..0000000
--- a/src/main/java/eu/odp/harvest/geo/oai/http/AllowAllX509TrustManager.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package eu.odp.harvest.geo.oai.http;
-
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-
-/**
- * Based on AllowAllX509TrustManager from Apache httpclient-ssl-contrib, but trusts all server certificates, not just
- * self-signed.
- * WARNING: Use of this class is insecure, as it basically nullifies the purpose of HTTPS.
- * Do not use it if you need connections to trusted providers.
- */
-public class AllowAllX509TrustManager implements X509TrustManager {
-    private X509TrustManager standardTrustManager = null;
-
-    /**
-     * Constructor for AllowAllX509TrustManager.
-     */
-    public AllowAllX509TrustManager(KeyStore keystore) throws NoSuchAlgorithmException, KeyStoreException {
-        super();
-        TrustManagerFactory factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-        factory.init(keystore);
-        TrustManager[] trustmanagers = factory.getTrustManagers();
-        if (trustmanagers.length == 0) {
-            throw new NoSuchAlgorithmException("no trust manager found");
-        }
-        this.standardTrustManager = (X509TrustManager)trustmanagers[0];
-    }
-
-    /**
-     * @see javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[],String authType)
-     */
-    public void checkClientTrusted(X509Certificate[] certificates,String authType) throws CertificateException {
-        standardTrustManager.checkClientTrusted(certificates,authType);
-    }
-
-    /**
-     * @see javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[],String authType)
-     */
-    public void checkServerTrusted(X509Certificate[] certificates,String authType) throws CertificateException {
-/*
-        if ((certificates != null) && (certificates.length == 1)) {
-            certificates[0].checkValidity();
-        } else {
-            standardTrustManager.checkServerTrusted(certificates,authType);
-        }
-*/
-    }
-
-    /**
-     * @see javax.net.ssl.X509TrustManager#getAcceptedIssuers()
-     */
-    public X509Certificate[] getAcceptedIssuers() {
-        return this.standardTrustManager.getAcceptedIssuers();
-    }
-}
diff --git a/src/main/java/eu/odp/harvest/geo/oai/xslt/HttpAwareUriResolver.java b/src/main/java/eu/odp/harvest/geo/oai/xslt/HttpAwareUriResolver.java
index d4640af..9e70765 100644
--- a/src/main/java/eu/odp/harvest/geo/oai/xslt/HttpAwareUriResolver.java
+++ b/src/main/java/eu/odp/harvest/geo/oai/xslt/HttpAwareUriResolver.java
@@ -4,17 +4,18 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.ProducerTemplate;
-import org.apache.camel.builder.xml.XsltUriResolver;
-import org.apache.camel.impl.DefaultExchange;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
-import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.camel.component.xslt.XsltUriResolver;
+import org.apache.camel.support.DefaultExchange;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.log4j.Logger;
 
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.stream.StreamSource;
-import java.io.ByteArrayInputStream;
 
 /**
  * Resolves a document reference for protocols "http" or "https" in an XSL document with HTTP client.
@@ -25,7 +26,8 @@ public class HttpAwareUriResolver extends XsltUriResolver {
 
     private final static Logger LOG = Logger.getLogger(HttpAwareUriResolver.class);
 
-    private static HttpClient httpClient = new HttpClient(new MultiThreadedHttpConnectionManager());
+    private static HttpClient httpClient = HttpClients.custom()
+            .setConnectionManager(new PoolingHttpClientConnectionManager()).build();
     private ProducerTemplate template;
     private CamelContext context;
 
@@ -71,18 +73,11 @@ private Source resolveRoute(String href) {
         String[] parts = href.split("\\?");
         exchange.getIn().setHeader("resourceIdentifiers", parts[1]);
         template.send(parts[0], exchange);
-        return new StreamSource(exchange.getOut().getBody(java.io.InputStream.class));
+        return new StreamSource(exchange.getMessage().getBody(java.io.InputStream.class));
     }
 
     private Source resolveHttp(String href) throws Exception {
-        GetMethod method = new GetMethod(href);
-        try {
-            httpClient.executeMethod(method);
-            byte[] bytes = method.getResponseBody();
-            return new StreamSource(new ByteArrayInputStream(bytes));
-        }
-        finally {
-            method.releaseConnection();
-        }
+        HttpResponse response = httpClient.execute(new HttpGet(href));
+        return new StreamSource(response.getEntity().getContent());
     }
 }
diff --git a/src/main/resources/camel-oai-pmh.xml b/src/main/resources/camel-oai-pmh.xml
index 83a71a5..ba97401 100644
--- a/src/main/resources/camel-oai-pmh.xml
+++ b/src/main/resources/camel-oai-pmh.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:camel="http://camel.apache.org/schema/spring"
-       xmlns:context="http://www.springframework.org/schema/context" xmlns:xsl="http://camel.apache.org/schema/spring"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <!-- spring camel bridge property placeholder -->
@@ -20,21 +16,12 @@
         <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
      </bean>
 
-    <!-- This configures HttpClient to trust all server certificates - there are several catalogs that use self-signed
-     certificates. Remove this bean from the configuration if you require trusted HTTPS connections! -->
-    <bean id="httpClientConfigurer" class="eu.odp.harvest.geo.oai.http.AllowAllHttpClientConfig"/>
-
     <bean id="uriResolverFactory" class="eu.odp.harvest.geo.oai.xslt.HttpAwareUriResolverFactory">
         <property name="producer" ref="template"/>
     </bean>
 
     <!-- Camel context for this application -->
     <camelContext xmlns="http://camel.apache.org/schema/spring" xmlns:oai="http://www.openarchives.org/OAI/2.0/">
-        <properties>
-            <property key="http.proxyHost" value="{{http.proxyHost:}}"/>
-            <property key="http.proxyPort" value="{{http.proxyPort:}}"/>
-            <property key="http.nonProxyHosts" value="{{http.nonProxyHosts:}}"/>
-        </properties>
 
         <template id="template"/>
 
@@ -79,63 +66,63 @@
                 <constant>&lt;error&gt;Internal error, please check the log files&lt;/error&gt;</constant>
             </setBody>
             <removeHeaders pattern="*"/>
-            <setHeader headerName="CamelHttpResponseCode">
+            <setHeader name="CamelHttpResponseCode">
                 <constant>500</constant>
             </setHeader>
         </onException>
 
         <!-- route for INSPIRE catalogs -->
         <route>
-            <from ref="inspire"/>
-            <setHeader headerName="response_date">
+            <from uri="ref:inspire"/>
+            <setHeader name="response_date">
                 <simple>${date:now:yyyy-MM-dd'T'HH:mm:ss'Z'}</simple>
             </setHeader>
-            <setHeader headerName="contributorID">
+            <setHeader name="contributorID">
                 <simple>{{dcatde.contributorID}}</simple>
             </setHeader>
-            <setHeader headerName="cswServiceShowMetadataBaseUrl">
+            <setHeader name="cswServiceShowMetadataBaseUrl">
                 <simple>{{csw.serviceShowMetadata.URL}}</simple>
             </setHeader>
-            <setHeader headerName="sortResults">
+            <setHeader name="sortResults">
                 <simple>{{db.item.csw.sortResults}}</simple>
             </setHeader>
-            <removeHeader headerName="page"/>
-            <removeHeader headerName="cookie"/>
+            <removeHeader name="page"/>
+            <removeHeader name="cookie"/>
             <!-- we need some element for xsl input, but the result only depends on header (request) parameters -->
             <setBody>
                 <constant>&lt;dummy/&gt;</constant>
             </setBody>
             <to uri="xslt:inspireRequest.xsl"/>
-            <removeHeader headerName="CamelHttpQuery"/>
+            <removeHeader name="CamelHttpQuery"/>
             <to uri="log:input"/>
             <choice>
                 <when>
                     <!-- Only send a GetRecords request to the target catalog if we have not already created an OAI-PMH response -->
                     <xpath>count(/oai:OAI-PMH) = 0</xpath>
-                    <setHeader headerName="CamelHttpMethod">
+                    <setHeader name="CamelHttpMethod">
                         <constant>POST</constant>
                     </setHeader>
                     <choice>
                         <when>
                             <simple>${header.soapVersion} == '1.1'</simple>
-                            <setHeader headerName="Content-Type">
+                            <setHeader name="Content-Type">
                                 <constant>text/xml</constant>
                             </setHeader>
                         </when>
                         <when>
                             <simple>${header.soapVersion} == '1.2'</simple>
-                            <setHeader headerName="Content-Type">
+                            <setHeader name="Content-Type">
                                 <constant>application/soap+xml</constant>
                             </setHeader>
                         </when>
                         <otherwise>
-                            <setHeader headerName="Content-Type">
+                            <setHeader name="Content-Type">
                                 <constant>application/xml</constant>
                             </setHeader>
                         </otherwise>
                     </choice>
                     <!-- Replaced dynamically with the target catalog URL -->
-                    <to uri="http://dummy?httpClient.soTimeout=180000"/>
+                    <to uri="http://dummy?httpClient.SocketTimeout=180000"/>
                     <!-- transform the GetRecordsResponse -->
                     <choice>
                         <when>
@@ -149,33 +136,33 @@
                     </choice>
                 </when>
             </choice>
-            <setHeader headerName="Content-Type">
+            <setHeader name="Content-Type">
                 <constant>text/xml</constant>
             </setHeader>
         </route>
 
         <!-- route for INSPIRE catalogs via SOAP 1.1 -->
         <route>
-            <from ref="inspireSoap11"/>
-            <setHeader headerName="soapVersion">
+            <from uri="ref:inspireSoap11"/>
+            <setHeader name="soapVersion">
                 <simple>1.1</simple>
             </setHeader>
-            <setHeader headerName="SOAPAction">
+            <setHeader name="SOAPAction">
                 <constant>http://www.opengis.net/cat/csw/2.0.2/requests#GetRecords</constant>
             </setHeader>
-            <to ref="inspire"/>
+            <to uri="ref:inspire"/>
         </route>
 
         <!-- route for INSPIRE catalogs via SOAP 1.2 -->
         <route>
-            <from ref="inspireSoap12"/>
-            <setHeader headerName="soapVersion">
+            <from uri="ref:inspireSoap12"/>
+            <setHeader name="soapVersion">
                 <simple>1.2</simple>
             </setHeader>
-            <setHeader headerName="SOAPAction">
+            <setHeader name="SOAPAction">
                 <constant>http://www.opengis.net/cat/csw/2.0.2/requests#GetRecords</constant>
             </setHeader>
-            <to ref="inspire"/>
+            <to uri="ref:inspire"/>
         </route>
 
         <!-- this route retrieves the coupled services from a CSW for datasets based on the datasets' resource identifiers.
@@ -189,41 +176,41 @@
             <to uri="xslt:coupledServices.xsl"/>
             <convertBodyTo type="java.lang.String"/>
             <to uri="log:input"/>
-            <setHeader headerName="CamelHttpUri">
+            <setHeader name="CamelHttpUri">
                 <simple>{{db.item.csw.URL}}</simple>
             </setHeader>
             <choice>
                 <when>
                     <simple>${header.soapVersion} == '1.1'</simple>
-                    <setHeader headerName="Content-Type">
+                    <setHeader name="Content-Type">
                         <constant>text/xml</constant>
                     </setHeader>
                 </when>
                 <when>
                     <simple>${header.soapVersion} == '1.2'</simple>
-                    <setHeader headerName="Content-Type">
+                    <setHeader name="Content-Type">
                         <constant>application/soap+xml</constant>
                     </setHeader>
                 </when>
                 <otherwise>
-                    <setHeader headerName="Content-Type">
+                    <setHeader name="Content-Type">
                         <constant>application/xml</constant>
                     </setHeader>
                 </otherwise>
             </choice>
-            <setHeader headerName="CamelHttpMethod">
+            <setHeader name="CamelHttpMethod">
                 <constant>POST</constant>
             </setHeader>
-            <to uri="http://dummy?httpClient.soTimeout=180000"/>
+            <to uri="http://dummy?httpClient.SocketTimeout=180000"/>
         </route>
 
         <!-- route for INSPIRE catalogs via SOAP 1.1 -->
         <route>
             <from uri="direct:getCoupledServicesSoap11"/>
-            <setHeader headerName="soapVersion">
+            <setHeader name="soapVersion">
                 <simple>1.1</simple>
             </setHeader>
-            <setHeader headerName="SOAPAction">
+            <setHeader name="SOAPAction">
                 <constant>http://www.opengis.net/cat/csw/2.0.2/requests#GetRecords</constant>
             </setHeader>
             <to uri="direct:getCoupledServices"/>
@@ -232,10 +219,10 @@
         <!-- route for INSPIRE catalogs via SOAP 1.2 -->
         <route>
             <from uri="direct:getCoupledServicesSoap12"/>
-            <setHeader headerName="soapVersion">
+            <setHeader name="soapVersion">
                 <simple>1.2</simple>
             </setHeader>
-            <setHeader headerName="SOAPAction">
+            <setHeader name="SOAPAction">
                 <constant>http://www.opengis.net/cat/csw/2.0.2/requests#GetRecords</constant>
             </setHeader>
             <to uri="direct:getCoupledServices"/>
@@ -243,59 +230,59 @@
 
         <!-- route for INSPIRE catalogs output as RDF catalog -->
         <route>
-            <from ref="catalog-inspire"/>
-            <setHeader headerName="response_date">
+            <from uri="ref:catalog-inspire"/>
+            <setHeader name="response_date">
                 <simple>${date:now:yyyy-MM-dd'T'HH:mm:ss'Z'}</simple>
             </setHeader>
-            <setHeader headerName="baseCatalogUri">
+            <setHeader name="baseCatalogUri">
                 <simple>{{rdf.catalog.base.url}}</simple>
             </setHeader>
-            <setHeader headerName="contributorID">
+            <setHeader name="contributorID">
                 <simple>{{dcatde.contributorID}}</simple>
             </setHeader>
-            <setHeader headerName="sortResults">
+            <setHeader name="sortResults">
                 <simple>{{db.item.csw.sortResults}}</simple>
             </setHeader>
-            <setHeader headerName="cswServiceShowMetadataBaseUrl">
+            <setHeader name="cswServiceShowMetadataBaseUrl">
                 <simple>{{csw.serviceShowMetadata.URL}}</simple>
             </setHeader>
-            <removeHeader headerName="resumptionToken"/>
-            <removeHeader headerName="cookie"/>
+            <removeHeader name="resumptionToken"/>
+            <removeHeader name="cookie"/>
             <!-- we need some element for xsl input, but the result only depends on header (request) parameters -->
             <setBody>
                 <constant>&lt;dummy/&gt;</constant>
             </setBody>
             <to uri="xslt:inspireRequest.xsl"/>
-            <removeHeader headerName="CamelHttpQuery"/>
+            <removeHeader name="CamelHttpQuery"/>
             <to uri="log:input"/>
             <choice>
                 <when>
                     <!-- Only send a GetRecords request to the target catalog if we have not already created an OAI-PMH response -->
                     <xpath>count(/oai:OAI-PMH) = 0</xpath>
-                    <setHeader headerName="CamelHttpMethod">
+                    <setHeader name="CamelHttpMethod">
                         <constant>POST</constant>
                     </setHeader>
                     <choice>
                         <when>
                             <simple>${header.soapVersion} == '1.1'</simple>
-                            <setHeader headerName="Content-Type">
+                            <setHeader name="Content-Type">
                                 <constant>text/xml</constant>
                             </setHeader>
                         </when>
                         <when>
                             <simple>${header.soapVersion} == '1.2'</simple>
-                            <setHeader headerName="Content-Type">
+                            <setHeader name="Content-Type">
                                 <constant>application/soap+xml</constant>
                             </setHeader>
                         </when>
                         <otherwise>
-                            <setHeader headerName="Content-Type">
+                            <setHeader name="Content-Type">
                                 <constant>application/xml</constant>
                             </setHeader>
                         </otherwise>
                     </choice>
                     <!-- Replaced dynamically with the target catalog URL -->
-                    <to uri="http://dummy?httpClient.soTimeout=180000"/>
+                    <to uri="http://dummy?httpClient.SocketTimeout=180000"/>
                     <!-- transform the GetRecordsResponse -->
                     <choice>
                         <when>
@@ -309,35 +296,35 @@
                     </choice>
                 </when>
             </choice>
-            <setHeader headerName="Content-Type">
+            <setHeader name="Content-Type">
                 <constant>application/rdf+xml</constant>
             </setHeader>
         </route>
 
         <!-- management route for harvester types -->
         <route>
-            <from ref="mgmtHarvesterTypes"/>
+            <from uri="ref:mgmtHarvesterTypes"/>
             <setBody>
                 <simple>resource:classpath:/harvester-types.xml</simple>
             </setBody>
-            <setHeader headerName="Content-Type">
+            <setHeader name="Content-Type">
                 <constant>text/xml</constant>
             </setHeader>
         </route>
 
         <!-- generic route for nrw csw harvesters -->
         <route>
-            <from ref="csw"/>
-            <setHeader headerName="CamelHttpUri">
+            <from uri="ref:csw"/>
+            <setHeader name="CamelHttpUri">
                 <simple>{{db.item.csw.URL}}</simple>
             </setHeader>
-            <setHeader headerName="CamelHttpPath">
+            <setHeader name="CamelHttpPath">
                 <constant/>
             </setHeader>
             <choice>
                 <when>
                     <simple>${header.metadataPrefix} == null</simple>
-                    <setHeader headerName="metadataPrefix">
+                    <setHeader name="metadataPrefix">
                         <simple>dcat_ap</simple>
                     </setHeader>
                 </when>
@@ -348,17 +335,17 @@
         </route>
 
         <route>
-            <from ref="catalog"/>
-            <setHeader headerName="CamelHttpUri">
+            <from uri="ref:catalog"/>
+            <setHeader name="CamelHttpUri">
                 <simple>{{db.item.csw.URL}}</simple>
             </setHeader>
-            <setHeader headerName="CamelHttpPath">
+            <setHeader name="CamelHttpPath">
                 <constant/>
             </setHeader>
             <choice>
                 <when>
                     <simple>${header.metadataPrefix} == null</simple>
-                    <setHeader headerName="metadataPrefix">
+                    <setHeader name="metadataPrefix">
                         <simple>dcat_ap</simple>
                     </setHeader>
                 </when>
@@ -372,56 +359,56 @@
         </route>
 
         <route>
-            <from ref="cswHarvesters"/>
-            <to ref="csw"/>
+            <from uri="ref:cswHarvesters"/>
+            <to uri="ref:csw"/>
         </route>
 
         <route>
-            <from ref="cswIds"/>
-            <setHeader headerName="verb">
+            <from uri="ref:cswIds"/>
+            <setHeader name="verb">
                 <simple>ListIdentifiers</simple>
             </setHeader>
-            <to ref="csw"/>
+            <to uri="ref:csw"/>
         </route>
 
         <route>
-            <from ref="cswRecords"/>
-            <setHeader headerName="verb">
+            <from uri="ref:cswRecords"/>
+            <setHeader name="verb">
                 <simple>ListRecords</simple>
             </setHeader>
-            <to ref="csw"/>
+            <to uri="ref:csw"/>
         </route>
 
         <route>
-            <from ref="cswRecord"/>
-            <setHeader headerName="verb">
+            <from uri="ref:cswRecord"/>
+            <setHeader name="verb">
                 <simple>GetRecord</simple>
             </setHeader>
-            <to ref="csw"/>
+            <to uri="ref:csw"/>
         </route>
 
         <route>
-            <from ref="dcatCatalog"/>
-            <setHeader headerName="verb">
+            <from uri="ref:dcatCatalog"/>
+            <setHeader name="verb">
                 <simple>ListRecords</simple>
             </setHeader>
-            <to ref="catalog"/>
+            <to uri="ref:catalog"/>
         </route>
 
         <route>
-            <from ref="ckan"/>
-            <setHeader headerName="response_date">
+            <from uri="ref:ckan"/>
+            <setHeader name="response_date">
                 <simple>${date:now:yyyy-MM-dd'T'HH:mm:ss'Z'}</simple>
             </setHeader>
             <choice>
                 <when>
                     <simple>${header.metadataPrefix} == null</simple>
-                    <setHeader headerName="metadataPrefix">
+                    <setHeader name="metadataPrefix">
                         <simple>iso19139</simple>
                     </setHeader>
                 </when>
             </choice>
-            <setHeader headerName="db.item.ckan.URL">
+            <setHeader name="db.item.ckan.URL">
                 <simple>{{db.item.ckan.URL}}</simple>
             </setHeader>
             <setBody>
@@ -434,31 +421,31 @@
                 <when>
                     <!-- Only send a GetRecords request to the target catalog if we have not already created an OAI-PMH response -->
                     <xpath>count(/oai:OAI-PMH) = 0</xpath>
-                    <setHeader headerName="CamelHttpMethod">
+                    <setHeader name="CamelHttpMethod">
                         <constant>GET</constant>
                     </setHeader>
-                    <setHeader headerName="CamelHttpPath">
+                    <setHeader name="CamelHttpPath">
                         <constant/>
                     </setHeader>
-                    <setHeader headerName="CamelHttpUri">
+                    <setHeader name="CamelHttpUri">
                         <xpath>/parameters/parameter[name='httpUri']/value/text()</xpath>
                     </setHeader>
-                    <setHeader headerName="CamelHttpQuery">
+                    <setHeader name="CamelHttpQuery">
                         <xpath>/parameters/parameter[name='httpQuery']/value/text()</xpath>
                     </setHeader>
 
-                    <!--<removeHeader headerName="verb"/>-->
-                    <!--<removeHeader headerName="from"/>-->
-                    <!--<removeHeader headerName="until"/>-->
-                    <!--<removeHeader headerName="identifier"/>-->
-                    <!--<removeHeader headerName="metadataPrefix"/>-->
-                    <!--<removeHeader headerName="resumptionToken"/>-->
+                    <!--<removeHeader name="verb"/>-->
+                    <!--<removeHeader name="from"/>-->
+                    <!--<removeHeader name="until"/>-->
+                    <!--<removeHeader name="identifier"/>-->
+                    <!--<removeHeader name="metadataPrefix"/>-->
+                    <!--<removeHeader name="resumptionToken"/>-->
 
                     <!-- Replaced dynamically with the target catalog URL -->
-                    <to uri="http://dummy?httpClient.soTimeout=180000"/>
+                    <to uri="http://dummy?httpClient.SocketTimeout=180000"/>
                     <!-- transform the csw -->
                     <convertBodyTo type="java.lang.String"/>
-                    <setHeader headerName="json">
+                    <setHeader name="json">
                         <simple>${body}</simple>
                     </setHeader>
                     <setBody>
@@ -473,39 +460,39 @@
                 </when>
             </choice>
             <removeHeaders pattern="*"/>
-            <setHeader headerName="Content-Type">
+            <setHeader name="Content-Type">
                 <constant>text/xml</constant>
             </setHeader>
         </route>
 
         <!-- generic route for nrw ckan harvesters -->
         <route>
-            <from ref="ckanHarvesters"/>
-            <to ref="ckan"/>
+            <from uri="ref:ckanHarvesters"/>
+            <to uri="ref:ckan"/>
         </route>
 
         <route>
-            <from ref="ckanIds"/>
-            <setHeader headerName="verb">
+            <from uri="ref:ckanIds"/>
+            <setHeader name="verb">
                 <simple>ListIdentifiers</simple>
             </setHeader>
-            <to ref="ckan"/>
+            <to uri="ref:ckan"/>
         </route>
 
         <route>
-            <from ref="ckanRecords"/>
-            <setHeader headerName="verb">
+            <from uri="ref:ckanRecords"/>
+            <setHeader name="verb">
                 <simple>ListRecords</simple>
             </setHeader>
-            <to ref="ckan"/>
+            <to uri="ref:ckan"/>
         </route>
 
         <route>
-            <from ref="ckanRecord"/>
-            <setHeader headerName="verb">
+            <from uri="ref:ckanRecord"/>
+            <setHeader name="verb">
                 <simple>GetRecord</simple>
             </setHeader>
-            <to ref="ckan"/>
+            <to uri="ref:ckan"/>
         </route>
     </camelContext>
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/languageCodes.rdf b/src/main/resources/languageCodes.rdf
index 1079f7b..596977c 100644
--- a/src/main/resources/languageCodes.rdf
+++ b/src/main/resources/languageCodes.rdf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
 <!-- refer to languages-skos.rdf at https://publications.europa.eu/en/web/eu-vocabularies/at-dataset/-/resource/dataset/language
 for a list containing all three types of codes -->