Merge branch 'feature/opensaml4' into 'nightlybuild'

Feature/opensaml4

See merge request egiz/eidas_at_proxy!13

11 files changed, 197 insertions, 152 deletions

diff --git a/connector/pom.xml b/connector/pom.xml
index 63a39346..2b2c0925 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -33,6 +33,16 @@
     <dependency>
       <groupId>at.gv.egiz.eaaf</groupId>
       <artifactId>eaaf_module_pvp2_idp</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcpkix-jdk15on</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcprov-jdk15on</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>at.asitplus.eidas.ms_specific</groupId>
diff --git a/connector/src/main/resources/specific_eIDAS_connector.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
index df2a9aa4..8ff4e565 100644
--- a/connector/src/main/resources/specific_eIDAS_connector.beans.xml
+++ b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
@@ -104,7 +104,7 @@
     class="at.asitplus.eidas.specific.connector.gui.DefaultVelocityGuiBuilderImpl" />
 
   <bean id="mvcGUIBuilderImpl"
-    class="at.asitplus.eidas.specific.connector.gui.SpringMvcGuiFormBuilderImpl" />
+    class="at.gv.egiz.eaaf.core.impl.gui.builder.SpringMvcGuiFormBuilderImpl" />
 
   <bean id="StatusMessageProvider"
     class="at.asitplus.eidas.specific.connector.provider.StatusMessageProvider" />
diff --git a/connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java b/connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
index 64e8272e..63b11322 100644
--- a/connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
+++ b/connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
@@ -8,6 +8,7 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
 import java.net.URISyntaxException;
+import java.time.Instant;
 import java.util.Map;
 import java.util.Timer;
 
@@ -15,7 +16,6 @@ import javax.xml.transform.TransformerException;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.ignite.Ignition;
-import org.joda.time.DateTime;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
@@ -475,7 +475,7 @@ public class FullStartUpAndProcessTest {
     final RequestAbstractType authnReq = (RequestAbstractType) XMLObjectSupport.unmarshallFromInputStream(
         XMLObjectProviderRegistrySupport.getParserPool(),
         Pvp2SProfileEndPointTest.class.getResourceAsStream("/data/pvp2_authn_1.xml"));
-    authnReq.setIssueInstant(DateTime.now());    
+    authnReq.setIssueInstant(Instant.now());    
     RequestAbstractType signedAuthnReq = 
         Saml2Utils.signSamlObject(authnReq, credentialProvider.getMessageSigningCredential(), true);           
     String b64 = Base64Utils.encodeToString(DomUtils.serializeNode(
diff --git a/connector/src/test/java/at/asitplus/eidas/specific/connector/test/saml2/Pvp2SProfileEndPointTest.java b/connector/src/test/java/at/asitplus/eidas/specific/connector/test/saml2/Pvp2SProfileEndPointTest.java
index bcba3e11..6b39bd76 100644
--- a/connector/src/test/java/at/asitplus/eidas/specific/connector/test/saml2/Pvp2SProfileEndPointTest.java
+++ b/connector/src/test/java/at/asitplus/eidas/specific/connector/test/saml2/Pvp2SProfileEndPointTest.java
@@ -6,12 +6,12 @@ import java.io.UnsupportedEncodingException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
+import java.time.Instant;
 import java.util.List;
 import java.util.Timer;
 
 import javax.xml.transform.TransformerException;
 
-import org.joda.time.DateTime;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -129,7 +129,7 @@ public class Pvp2SProfileEndPointTest {
     final RequestAbstractType authnReq = (RequestAbstractType) XMLObjectSupport.unmarshallFromInputStream(
         XMLObjectProviderRegistrySupport.getParserPool(),
         Pvp2SProfileEndPointTest.class.getResourceAsStream("/data/pvp2_authn_3.xml"));
-    authnReq.setIssueInstant(DateTime.now());    
+    authnReq.setIssueInstant(Instant.now());    
     RequestAbstractType signedAuthnReq = 
         Saml2Utils.signSamlObject(authnReq, credentialProvider.getMetaDataSigningCredential(), true);           
     String b64 = Base64Utils.encodeToString(DomUtils.serializeNode(
@@ -166,7 +166,7 @@ public class Pvp2SProfileEndPointTest {
     final RequestAbstractType authnReq = (RequestAbstractType) XMLObjectSupport.unmarshallFromInputStream(
         XMLObjectProviderRegistrySupport.getParserPool(),
         Pvp2SProfileEndPointTest.class.getResourceAsStream("/data/pvp2_authn_1.xml"));
-    authnReq.setIssueInstant(DateTime.now());    
+    authnReq.setIssueInstant(Instant.now());    
     RequestAbstractType signedAuthnReq = 
         Saml2Utils.signSamlObject(authnReq, credentialProvider.getMetaDataSigningCredential(), true);           
     String b64 = Base64Utils.encodeToString(DomUtils.serializeNode(
@@ -203,7 +203,7 @@ public class Pvp2SProfileEndPointTest {
     final RequestAbstractType authnReq = (RequestAbstractType) XMLObjectSupport.unmarshallFromInputStream(
         XMLObjectProviderRegistrySupport.getParserPool(),
         Pvp2SProfileEndPointTest.class.getResourceAsStream("/data/pvp2_authn_1.xml"));
-    authnReq.setIssueInstant(DateTime.now());    
+    authnReq.setIssueInstant(Instant.now());    
     RequestAbstractType signedAuthnReq = 
         Saml2Utils.signSamlObject(authnReq, credentialProvider.getMetaDataSigningCredential(), true);           
     String b64 = Base64Utils.encodeToString(DomUtils.serializeNode(
@@ -240,7 +240,7 @@ public class Pvp2SProfileEndPointTest {
     final RequestAbstractType authnReq = (RequestAbstractType) XMLObjectSupport.unmarshallFromInputStream(
         XMLObjectProviderRegistrySupport.getParserPool(),
         Pvp2SProfileEndPointTest.class.getResourceAsStream("/data/pvp2_authn_1.xml"));
-    authnReq.setIssueInstant(DateTime.now());    
+    authnReq.setIssueInstant(Instant.now());    
     RequestAbstractType signedAuthnReq = 
         Saml2Utils.signSamlObject(authnReq, credentialProvider.getMessageSigningCredential(), true);           
     String b64 = Base64Utils.encodeToString(DomUtils.serializeNode(
diff --git a/connector/src/test/resources/spring/SpringTest_connector.beans.xml b/connector/src/test/resources/spring/SpringTest_connector.beans.xml
index 4d770570..8f3d25ad 100644
--- a/connector/src/test/resources/spring/SpringTest_connector.beans.xml
+++ b/connector/src/test/resources/spring/SpringTest_connector.beans.xml
@@ -96,7 +96,7 @@
     class="at.asitplus.eidas.specific.connector.gui.DefaultVelocityGuiBuilderImpl" />
 
   <bean id="mvcGUIBuilderImpl"
-    class="at.asitplus.eidas.specific.connector.gui.SpringMvcGuiFormBuilderImpl" />
+    class="at.gv.egiz.eaaf.core.impl.gui.builder.SpringMvcGuiFormBuilderImpl" />
 
   <bean id="templateEngine"
     class="org.thymeleaf.spring5.SpringTemplateEngine">
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/DefaultVelocityGuiBuilderImpl.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/DefaultVelocityGuiBuilderImpl.java
index e7ebc92f..2283081e 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/DefaultVelocityGuiBuilderImpl.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/DefaultVelocityGuiBuilderImpl.java
@@ -25,10 +25,14 @@ package at.asitplus.eidas.specific.connector.gui;
 
 import java.io.InputStream;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 
+import at.gv.egiz.eaaf.core.api.gui.IGuiBuilderConfiguration;
 import at.gv.egiz.eaaf.core.api.gui.IVelocityGuiBuilderConfiguration;
 import at.gv.egiz.eaaf.core.exceptions.GuiBuildException;
 import at.gv.egiz.eaaf.core.impl.gui.AbstractVelocityGuiFormBuilderImpl;
@@ -63,4 +67,11 @@ public class DefaultVelocityGuiBuilderImpl extends AbstractVelocityGuiFormBuilde
     }
   }
 
+  @Override
+  public String evaluateResponseContentType(HttpServletRequest httpReq, IGuiBuilderConfiguration config,
+      String loggerName) throws GuiBuildException {
+    return MediaType.TEXT_HTML_VALUE;
+    
+  }
+
 }
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/SpringMvcGuiFormBuilderImpl.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/SpringMvcGuiFormBuilderImpl.java
deleted file mode 100644
index 70ab73ad..00000000
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/SpringMvcGuiFormBuilderImpl.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package at.asitplus.eidas.specific.connector.gui;
-
-import java.util.Locale;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.servlet.LocaleResolver;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.View;
-import org.springframework.web.servlet.ViewResolver;
-
-import at.gv.egiz.eaaf.core.api.gui.IGuiBuilderConfiguration;
-import at.gv.egiz.eaaf.core.api.gui.ISpringMvcGuiFormBuilder;
-import at.gv.egiz.eaaf.core.exceptions.GuiBuildException;
-
-public class SpringMvcGuiFormBuilderImpl implements ISpringMvcGuiFormBuilder {
-  private static final Logger log = LoggerFactory.getLogger(SpringMvcGuiFormBuilderImpl.class);
-
-  private @Autowired(required = false) ViewResolver[] viewResolvers;
-  private @Autowired(required = false) LocaleResolver localeResolver;
-
-  @Override
-  public void build(HttpServletRequest httpReq, HttpServletResponse httpResp, IGuiBuilderConfiguration config,
-      String loggerName) throws GuiBuildException {
-    build(httpReq, httpResp, config, null, loggerName);
-
-  }
-
-  @Override
-  public void build(HttpServletRequest httpReq, HttpServletResponse httpResp, IGuiBuilderConfiguration config,
-      String contentType, String loggerName) throws GuiBuildException {
-    try {
-      final ModelAndView mav = new ModelAndView(config.getViewName());
-      if (config.getViewParameters() != null) {
-        mav.addAllObjects(config.getViewParameters());
-      }
-
-      render(mav, httpReq, httpResp);
-
-    } catch (final Exception e) {
-      log.info("Can NOT generate GUI for illustration", e);
-      throw new GuiBuildException(e.getMessage(), e);
-
-    }
-
-  }
-
-  protected void render(ModelAndView mv, HttpServletRequest request, HttpServletResponse response)
-      throws Exception {
-    // Determine locale for request and apply it to the response.
-    final Locale locale =
-        this.localeResolver != null ? this.localeResolver.resolveLocale(request) : request.getLocale();
-    response.setLocale(locale);
-
-    View view;
-    final String viewName = mv.getViewName();
-    if (viewName != null) {
-      // We need to resolve the view name.
-      view = resolveViewName(viewName, mv.getModelMap(), locale, request);
-      if (view == null) {
-        throw new ServletException("Could not resolve view with name '" + mv.getViewName() + "' ");
-      }
-
-    } else {
-      // No need to lookup: the ModelAndView object contains the actual View object.
-      view = mv.getView();
-      if (view == null) {
-        throw new ServletException("ModelAndView [" + mv + "] neither contains a view name nor a "
-            + "View object ");
-      }
-
-    }
-
-    // Delegate to the View object for rendering.
-    if (log.isTraceEnabled()) {
-      log.trace("Rendering view [{}] ", view);
-      
-    }
-
-    try {
-      HttpStatus status = mv.getStatus();
-      if (status != null) {
-        response.setStatus(status.value());
-        
-      }
-
-      view.render(mv.getModelMap(), request, response);
-
-    } catch (final Exception ex) {
-      if (log.isDebugEnabled()) {
-        log.debug("Error rendering view [" + view + "]", ex);
-      }
-
-      throw ex;
-
-    }
-
-  }
-
-  protected View resolveViewName(String viewName, @Nullable Map<String, Object> model,
-      Locale locale, HttpServletRequest request) throws Exception {
-    if (viewResolvers != null) {
-      for (final ViewResolver viewResolver : this.viewResolvers) {
-        final View view = viewResolver.resolveViewName(viewName, locale);
-        if (view != null) {
-          return view;
-        }
-
-      }
-    }
-
-    return null;
-  }
-
-}
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java
index 25f5beda..9701ddda 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java
@@ -26,7 +26,7 @@ package at.asitplus.eidas.specific.connector.gui;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.io.Resource;
@@ -123,16 +123,16 @@ public class StaticGuiBuilderConfiguration extends AbstractGuiFormBuilderConfigu
 
   @Override
   public void putCustomParameter(GroupDefinition group, String key, String value) {
-    setViewParameter(getFromGroup(), key, StringEscapeUtils.escapeHtml(value));
+    setViewParameter(getFromGroup(), key, StringEscapeUtils.escapeHtml4(value));
 
   }
 
   @Override
   protected void putSpecificViewParameters() {
     if (pendingReq != null) {
-      setViewParameter(getFromGroup(), PARAM_PENDINGREQUESTID, StringEscapeUtils.escapeHtml(pendingReq
+      setViewParameter(getFromGroup(), PARAM_PENDINGREQUESTID, StringEscapeUtils.escapeHtml4(pendingReq
           .getPendingRequestId()));
-      setViewParameter(getFromGroup(), PARAM_PENDINGREQUESTID_DEPRECATED, StringEscapeUtils.escapeHtml(
+      setViewParameter(getFromGroup(), PARAM_PENDINGREQUESTID_DEPRECATED, StringEscapeUtils.escapeHtml4(
           pendingReq.getPendingRequestId()));
 
     }
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_tasks_test.xml b/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_tasks_test.xml
index 60ecfa8c..6d6bb51e 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_tasks_test.xml
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_tasks_test.xml
@@ -20,7 +20,7 @@
   <import resource="SpringTest-context_basic_test.xml" />  
 
   <bean id="mvcGUIBuilderImpl"
-    class="at.asitplus.eidas.specific.connector.gui.SpringMvcGuiFormBuilderImpl" />
+    class="at.gv.egiz.eaaf.core.impl.gui.builder.SpringMvcGuiFormBuilderImpl" />
 
   <bean id="springManagedSpecificConnectorCommunicationService"
     class="at.asitplus.eidas.specific.modules.auth.eidas.v2.test.dummy.DummySpecificCommunicationService" />
diff --git a/infos/history.txt b/infos/history.txt
new file mode 100644
index 00000000..53218f48
--- /dev/null
+++ b/infos/history.txt
@@ -0,0 +1,46 @@
+Dieses Dokument zeigt die Veränderungen und Erweiterungen am eIDAS MS-Connector
+
+Version 1.2.3 (2021-10-21):  
+  - Bugfix
+    - Inkompatibilität zwischen AT MS-Connector und ID Austria System behoben
+  - Logging optimiert und Beispielkonfiguration um TransactionsId erweitert  
+  - Akutalisierung von Drittherstellerbibliotheken
+
+Version 1.2.2 (2021-06-26):
+  - Bugfix
+    - Inkompatibilität zwischen AT MS-Connector, EidasNode v2.5 und Deutscher Middleware behoben
+
+Version 1.2.1 (2021-05-28):
+   - Bugfix
+     - Möglichen Fehler in der Sprachauswahl via GUI behoben
+     
+Version 1.2 (2021-05-12):
+  - Erforderliche Anpassungen zur Integration in den ID Austria
+  - Update auf eIDAS Ref. Impl. 2.5.0 (Implementiert eIDAS Spezifikation 1.2) https://ec.europa.eu/cefdigital/wiki/display/CEFDIGITAL/eIDAS-Node+version+2.5
+  - Codestabilisierung 
+  - Monitoring und HealthChecks Verbesserungen
+  - Akutalisierung von Drittherstellerbibliotheken
+
+Version 1.1 (2019-12-13): 
+  - Update auf eIDAS Ref. Impl. 2.4.0 mit Apache Ignite Cache https://ec.europa.eu/cefdigital/wiki/display/CEFDIGITAL/eIDAS-Node+version+2.4
+  - Statischer Service-Provider Name für öffentliche Applikationen 
+  - Mindest LoA, welche für Requests an eIDAS Proxy-Services verwendet wird.
+  - Requested Attributes je Land konfigurierbar
+  - Neue Template-Engine mit i18n Unterstützung
+  - Neuer Algorithmus zur Generierung von Sessiontokens    
+  - Akutalisierung von Drittherstellerbibliotheken
+
+Version 1.0.1 (2019-08-02):   
+  - Update auf eIDAS Ref. Impl. 2.2.0
+  - Bugfix
+    - Ungültige Zeichenkodierung bei nonLatin Zeichen behoben
+  - Akutalisierung von Drittherstellerbibliotheken  
+  
+Version 1.0 (2018-10-30): 
+  - Initiale Version des eIDAS MS-Connector
+
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 80ee55b8..85460bd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,32 +22,39 @@
     <!-- ===================================================================== -->
     <egiz-spring-api>0.3</egiz-spring-api>
     <egiz-eventlog-slf4jBackend>0.4</egiz-eventlog-slf4jBackend>
-    <eaaf-core.version>1.1.17</eaaf-core.version>
+    <eaaf-core.version>1.2.1-SNAPSHOT</eaaf-core.version>
 
-    <spring-boot-starter-web.version>2.5.7</spring-boot-starter-web.version>
+    <spring-boot-starter-web.version>2.5.8</spring-boot-starter-web.version>
     <spring-boot-admin-starter-client.version>2.5.4</spring-boot-admin-starter-client.version>
-    <org.springframework.version>5.3.13</org.springframework.version>
+    <org.springframework.version>5.3.14</org.springframework.version>
     <org.thymeleaf-spring5.version>3.0.14.RELEASE</org.thymeleaf-spring5.version>
-    <cxf.version>3.4.5</cxf.version>
+    <apache.cxf.version>3.5.0</apache.cxf.version>
 
     <eidas-ref.version>2.5.0</eidas-ref.version>
 
     <org.apache.commons-lang3.version>3.12.0</org.apache.commons-lang3.version>
     <org.apache.commons-text.version>1.9</org.apache.commons-text.version>
     <commons-collections4.version>4.4</commons-collections4.version>
-    <com.google.guava.version>30.1.1-jre</com.google.guava.version>
+    <commons-io.version>2.11.0</commons-io.version>
+    <com.google.guava.version>31.0.1-jre</com.google.guava.version>
     <joda-time.version>2.10.13</joda-time.version>
     
-    <org.slf4j.version>1.7.30</org.slf4j.version>
-    <log4j.version>2.15.0</log4j.version>    
+    <org.slf4j.version>1.7.32</org.slf4j.version>
+    <log4j.version>2.17.1</log4j.version>    
+    <ch.qos.logback.version>1.2.10</ch.qos.logback.version>
   
-    <jackson-datatype-jsr310.version>2.12.5</jackson-datatype-jsr310.version>
+    <jackson-datatype-jsr310.version>2.13.1</jackson-datatype-jsr310.version>
     <!-- org.xerial.sqlite-jdbc.version>3.34.0</org.xerial.sqlite-jdbc.version -->
 
     <javax.validation-api.version>2.0.1.Final</javax.validation-api.version>
     <hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
     <org.bitbucket.b_c.jose4j.version>0.7.9</org.bitbucket.b_c.jose4j.version>
 
+
+    <!-- For software testing only -->
+    <json-path.version>2.6.0</json-path.version>
+    <jetty.version>9.4.44.v20210927</jetty.version>
+
     <!-- testing -->
     <junit.version>4.13.2</junit.version>
     <surefire.version>2.22.2</surefire.version>
@@ -256,7 +263,12 @@
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-to-slf4j</artifactId>
         <version>${log4j.version}</version>
-      </dependency>      
+      </dependency>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+        <version>${ch.qos.logback.version}</version>
+      </dependency>            
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
@@ -268,6 +280,11 @@
         <version>${org.apache.commons-text.version}</version>
       </dependency>
       <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>${commons-io.version}</version>
+      </dependency>      
+      <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
         <version>${com.google.guava.version}</version>
@@ -280,17 +297,47 @@
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-core</artifactId>
-        <version>${cxf.version}</version>
-      </dependency>      
+        <version>${apache.cxf.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxws</artifactId>
-        <version>${cxf.version}</version>
+        <version>${apache.cxf.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-transports-http</artifactId>
-        <version>${cxf.version}</version>
+        <version>${apache.cxf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-features-clustering</artifactId>
+        <version>${apache.cxf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-features-logging</artifactId>
+        <version>${apache.cxf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-databinding-jaxb</artifactId>
+        <version>${apache.cxf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-bindings-soap</artifactId>
+        <version>${apache.cxf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+        <version>${apache.cxf.version}</version>
+      </dependency>      
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-testutils</artifactId>
+        <version>${apache.cxf.version}</version>
       </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
@@ -351,6 +398,54 @@
         <scope>test</scope>
       </dependency>
       <dependency>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-transports-http-jetty</artifactId>
+        <version>${apache.cxf.version}</version>
+        <scope>test</scope>      
+      </dependency>            
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-transports-local</artifactId>
+        <version>${apache.cxf.version}</version>
+        <scope>test</scope>      
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-extension-providers</artifactId>
+        <version>${apache.cxf.version}</version>
+        <scope>test</scope>      
+      </dependency>      
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-http</artifactId>
+        <version>${jetty.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-server</artifactId>
+        <version>${jetty.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-io</artifactId>
+        <version>${jetty.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-util</artifactId>
+        <version>${jetty.version}</version>
+        <scope>test</scope>
+      </dependency>      
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-security</artifactId>
+        <version>${jetty.version}</version>
+        <scope>test</scope>
+      </dependency>      
+      <dependency>
         <groupId>at.gv.egiz.eaaf</groupId>
         <artifactId>eaaf_core_utils</artifactId>
         <version>${eaaf-core.version}</version>
@@ -402,7 +497,13 @@
         <artifactId>powermock-api-mockito2</artifactId>
         <version>${org.powermock.version}</version>
         <scope>test</scope>
-      </dependency>            
+      </dependency>
+      <dependency>
+        <groupId>com.jayway.jsonpath</groupId>
+        <artifactId>json-path</artifactId>
+        <version>${json-path.version}</version>
+        <scope>test</scope>
+      </dependency>  
     </dependencies>
   </dependencyManagement>
   <dependencies>
@@ -451,7 +552,7 @@
         <plugin>
           <groupId>org.apache.cxf</groupId>
           <artifactId>cxf-codegen-plugin</artifactId>
-          <version>${cxf.version}</version>
+          <version>${apache.cxf.version}</version>
         </plugin>