Merge branch 'nightlybuild' into feature/matching_base_rebase

# Conflicts:
#	.gitlab-ci.yml
#	connector/src/main/resources/specific_eIDAS_connector.beans.xml
#	connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
#	pom.xml

1 files changed, 125 insertions, 16 deletions

diff --git a/pom.xml b/pom.xml
index 927e8f5e..1c4ae383 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.asitplus.eidas</groupId>
   <artifactId>ms_specific</artifactId>
-  <version>1.2.3</version>
+  <version>1.2.4-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>MS specific eIDAS components</name>
@@ -22,29 +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.4</spring-boot-starter-web.version>
-    <spring-boot-admin-starter-client.version>2.5.1</spring-boot-admin-starter-client.version>
-    <org.springframework.version>5.3.10</org.springframework.version>
-    <org.thymeleaf-spring5.version>3.0.12.RELEASE</org.thymeleaf-spring5.version>
-    <cxf.version>3.4.4</cxf.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.14</org.springframework.version>
+    <org.thymeleaf-spring5.version>3.0.14.RELEASE</org.thymeleaf-spring5.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>
-    <joda-time.version>2.10.10</joda-time.version>
-    <org.slf4j.version>1.7.30</org.slf4j.version>
-    <jackson-datatype-jsr310.version>2.12.5</jackson-datatype-jsr310.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.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.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</junit.version>
     <surefire.version>2.22.2</surefire.version>
@@ -269,6 +279,16 @@
         <version>${org.slf4j.version}</version>
       </dependency>
       <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-to-slf4j</artifactId>
+        <version>${log4j.version}</version>
+      </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>
         <version>${org.apache.commons-lang3.version}</version>
@@ -279,6 +299,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>
@@ -291,17 +316,47 @@
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-core</artifactId>
-        <version>${cxf.version}</version>
+        <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>
@@ -362,6 +417,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>
@@ -428,7 +531,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>
@@ -477,7 +586,7 @@
         <plugin>
           <groupId>org.apache.cxf</groupId>
           <artifactId>cxf-codegen-plugin</artifactId>
-          <version>${cxf.version}</version>
+          <version>${apache.cxf.version}</version>
         </plugin>