From d8a6a3a0fa27f6ea487c9fc4006f705383780917 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Mon, 21 Dec 2020 18:09:50 +0100
Subject: switch to eIDAS Ref Impl. v2.5

---
 pom.xml | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 77 insertions(+), 10 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index c360f910..217b41ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,6 +24,8 @@
     <org.thymeleaf-spring5.version>3.0.11.RELEASE</org.thymeleaf-spring5.version>
     <cxf.version>3.4.1</cxf.version>
 
+    <eidas-ref.version>2.5.0</eidas-ref.version>
+
     <org.apache.commons-lang3.version>3.11</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>
@@ -31,7 +33,7 @@
     <joda-time.version>2.10.8</joda-time.version>
     <org.slf4j.version>1.7.30</org.slf4j.version>
     <jackson-datatype-jsr310.version>2.12.0</jackson-datatype-jsr310.version>
-
+    <!-- org.xerial.sqlite-jdbc.version>3.34.0</org.xerial.sqlite-jdbc.version -->
 
     <!-- testing -->
     <junit.version>4.13.1</junit.version>
@@ -146,6 +148,42 @@
         <version>${egiz.eidas.version}</version>
       </dependency>
 
+      <!-- eIDAS reference implemenation libs -->
+      <dependency>
+        <groupId>eu.eidas</groupId>
+        <artifactId>eidas-commons</artifactId>
+        <version>${eidas-ref.version}</version>
+        <!--scope>provided</scope -->
+        <exclusions>
+          <exclusion>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+          </exclusion>
+          <exclusion>
+            <artifactId>log4j-over-slf4j</artifactId>
+            <groupId>org.slf4j</groupId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>eu.eidas</groupId>
+        <artifactId>eidas-light-commons</artifactId>
+        <version>${eidas-ref.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>eu.eidas</groupId>
+        <artifactId>eidas-specific-communication-definition</artifactId>
+        <version>${eidas-ref.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>eu.eidas</groupId>
+        <artifactId>eidas-jcache-ignite-specific-communication</artifactId>
+        <version>${eidas-ref.version}</version>
+      </dependency>
+
 
       <!-- Third party libs -->
       <dependency>
@@ -254,6 +292,14 @@
         <scope>test</scope>
         <type>test-jar</type>
       </dependency>
+      <dependency>
+        <groupId>at.asitplus.eidas.ms_specific</groupId>
+        <artifactId>connector_lib</artifactId>
+        <version>${egiz.eidas.version}</version>
+        <scope>test</scope>
+        <type>test-jar</type>
+      </dependency>      
+      
     </dependencies>
   </dependencyManagement>
   <dependencies>
@@ -269,15 +315,36 @@
     <finalName>ms-specific_eidas_node</finalName>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>${maven-compiler-plugin.version}</version>
-          <configuration>
-            <source>1.8</source>
-            <target>1.8</target>
-          </configuration>
-        </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${maven-compiler-plugin.version}</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>compile</goal>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>        
+        
         <plugin>
           <groupId>org.apache.cxf</groupId>
           <artifactId>cxf-codegen-plugin</artifactId>
-- 
cgit v1.2.3


From 6b098e7070dedb5692325f6d330a20de696b9edc Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Tue, 22 Dec 2020 15:36:42 +0100
Subject: switch from Spring to Spring-Boot

---
 pom.xml | 110 ++++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 76 insertions(+), 34 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 217b41ec..739cbcbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,11 @@
     <!-- ===================================================================== -->
     <egiz-spring-api>0.3</egiz-spring-api>
     <egiz-eventlog-slf4jBackend>0.4</egiz-eventlog-slf4jBackend>
-    <eaaf-core.version>1.1.10</eaaf-core.version>
-    <org.springframework.version>5.2.12.RELEASE</org.springframework.version>
+    <eaaf-core.version>1.1.11-SNAPSHOT</eaaf-core.version>
+
+    <spring-boot-starter-web.version>2.4.1</spring-boot-starter-web.version>
+    <spring-boot-admin-starter-client.version>2.3.1</spring-boot-admin-starter-client.version>
+    <org.springframework.version>5.3.2</org.springframework.version>
     <org.thymeleaf-spring5.version>3.0.11.RELEASE</org.thymeleaf-spring5.version>
     <cxf.version>3.4.1</cxf.version>
 
@@ -35,6 +38,9 @@
     <jackson-datatype-jsr310.version>2.12.0</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>
+
     <!-- testing -->
     <junit.version>4.13.1</junit.version>
     <surefire.version>2.22.2</surefire.version>
@@ -121,6 +127,11 @@
         <artifactId>eaaf-core</artifactId>
         <version>${eaaf-core.version}</version>
       </dependency>
+      <dependency>
+        <groupId>at.gv.egiz.eaaf</groupId>
+        <artifactId>eaaf-springboot-utils</artifactId>
+        <version>${eaaf-core.version}</version>
+      </dependency>
       <dependency>
         <groupId>at.gv.egiz.eaaf</groupId>
         <artifactId>eaaf_module_pvp2_idp</artifactId>
@@ -186,6 +197,27 @@
 
 
       <!-- Third party libs -->
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-web</artifactId>
+        <version>${spring-boot-starter-web.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-actuator</artifactId>
+        <version>${spring-boot-starter-web.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-tomcat</artifactId>
+        <version>${spring-boot-starter-web.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>de.codecentric</groupId>
+        <artifactId>spring-boot-admin-starter-client</artifactId>
+        <version>${spring-boot-admin-starter-client.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-webmvc</artifactId>
@@ -257,6 +289,16 @@
         <artifactId>jackson-datatype-jsr310</artifactId>
         <version>${jackson-datatype-jsr310.version}</version>
       </dependency>
+      <dependency>
+        <groupId>javax.validation</groupId>
+        <artifactId>validation-api</artifactId>
+        <version>${javax.validation-api.version}</version>
+      </dependency>
+     <dependency>
+        <groupId>org.hibernate.validator</groupId>
+        <artifactId>hibernate-validator</artifactId>
+        <version>${hibernate-validator.version}</version>
+      </dependency>
 
 
       <!-- Testing -->
@@ -298,8 +340,8 @@
         <version>${egiz.eidas.version}</version>
         <scope>test</scope>
         <type>test-jar</type>
-      </dependency>      
-      
+      </dependency>
+
     </dependencies>
   </dependencyManagement>
   <dependencies>
@@ -315,36 +357,36 @@
     <finalName>ms-specific_eidas_node</finalName>
     <pluginManagement>
       <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>${maven-compiler-plugin.version}</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-              <goal>testCompile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>3.1.0</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>        
-        
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>${maven-compiler-plugin.version}</version>
+          <configuration>
+            <source>1.8</source>
+            <target>1.8</target>
+          </configuration>
+          <executions>
+            <execution>
+              <goals>
+                <goal>compile</goal>
+                <goal>testCompile</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.1.0</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>test-jar</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+
         <plugin>
           <groupId>org.apache.cxf</groupId>
           <artifactId>cxf-codegen-plugin</artifactId>
-- 
cgit v1.2.3


From f06839fb716ff61bf94a32f8e23e3f313245f7e7 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Sat, 26 Dec 2020 17:45:38 +0100
Subject: add jUnit test that simulates a full eIDAS authentication

---
 pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 739cbcbe..a4ef7028 100644
--- a/pom.xml
+++ b/pom.xml
@@ -314,6 +314,12 @@
         <version>${org.springframework.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-test</artifactId>
+        <version>${spring-boot-starter-web.version}</version>
+        <scope>test</scope>
+      </dependency>            
       <dependency>
         <groupId>com.github.skjolber</groupId>
         <artifactId>mockito-soap-cxf</artifactId>
@@ -334,6 +340,12 @@
         <scope>test</scope>
         <type>test-jar</type>
       </dependency>
+      <dependency>
+        <groupId>at.gv.egiz.eaaf</groupId>
+        <artifactId>eaaf_module_pvp2_sp</artifactId>
+        <version>${eaaf-core.version}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>at.asitplus.eidas.ms_specific</groupId>
         <artifactId>connector_lib</artifactId>
-- 
cgit v1.2.3


From 278c8a6d1f0518dc9d0875dbec84614b19800d5d Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Thu, 7 Jan 2021 20:03:54 +0100
Subject: switch from custom monitoring to Spring-Actuator healthchecks

---
 pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index a4ef7028..c8b9ae71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
     <junit.version>4.13.1</junit.version>
     <surefire.version>2.22.2</surefire.version>
     <mockito-soap-cxf.version>1.0.5</mockito-soap-cxf.version>
+    <com.squareup.okhttp3.version>4.0.0</com.squareup.okhttp3.version>
 
     <!-- Code quality checks -->
     <jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
@@ -353,7 +354,12 @@
         <scope>test</scope>
         <type>test-jar</type>
       </dependency>
-
+      <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>mockwebserver</artifactId>
+        <version>${com.squareup.okhttp3.version}</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <dependencies>
-- 
cgit v1.2.3


From 87cf2f74e2dc2dbc50333dc759fd6a206966c035 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Fri, 8 Jan 2021 11:33:28 +0100
Subject: add some jUnit test for SZR communication

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index c8b9ae71..d5e5d8df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <!-- ===================================================================== -->
     <egiz-spring-api>0.3</egiz-spring-api>
     <egiz-eventlog-slf4jBackend>0.4</egiz-eventlog-slf4jBackend>
-    <eaaf-core.version>1.1.11-SNAPSHOT</eaaf-core.version>
+    <eaaf-core.version>1.1.11</eaaf-core.version>
 
     <spring-boot-starter-web.version>2.4.1</spring-boot-starter-web.version>
     <spring-boot-admin-starter-client.version>2.3.1</spring-boot-admin-starter-client.version>
-- 
cgit v1.2.3


From a5d2e6d6fa2c75ae8211c818537524e8c54c3129 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Mon, 11 Jan 2021 15:15:03 +0100
Subject: fix some minor incompatibilities between AuthHandler and MS-Connector
 in E-ID mode

---
 pom.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index d5e5d8df..46d02706 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,9 +10,12 @@
 
   <name>MS specific eIDAS components</name>
 
-  <properties>
+  <properties>    
     <!-- Project versions -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <timestamp>${maven.build.timestamp}</timestamp>
+    <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
+    
     <egiz.eidas.version>${project.version}</egiz.eidas.version>
 
 
-- 
cgit v1.2.3