From 26e422ff90f2a4fb9d2d25c0b2328b365fe5f0d7 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Fri, 11 Dec 2020 16:33:00 +0100
Subject: add 'findSecBugs' plug-in into 'spotBugs' module and solve bugs or
 exclude false-positive update gitlab-ci configuration to display jUnit
 test-coverage

---
 connector/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'connector/pom.xml')

diff --git a/connector/pom.xml b/connector/pom.xml
index 6621fb0f..3c2ddf07 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -156,6 +156,15 @@
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+        <version>${spotbugs-maven-plugin.version}</version>
+        <configuration>
+          <excludeFilterFile>checks/spotbugs-exclude.xml</excludeFilterFile>
+        </configuration>
+      </plugin>
+
     </plugins>
   </build>
 </project>
-- 
cgit v1.2.3


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

---
 connector/pom.xml | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'connector/pom.xml')

diff --git a/connector/pom.xml b/connector/pom.xml
index 3c2ddf07..dad27b38 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -110,15 +110,6 @@
     <finalName>ms_connector</finalName>
 
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-
       <!-- enable co-existence of testng and junit -->
       <plugin>
         <artifactId>maven-surefire-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

---
 connector/pom.xml | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 86 insertions(+), 6 deletions(-)

(limited to 'connector/pom.xml')

diff --git a/connector/pom.xml b/connector/pom.xml
index dad27b38..7fbc2a36 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -49,7 +49,15 @@
       <artifactId>authmodule-eIDAS-v2</artifactId>
     </dependency>
 
-    <!-- Third party libs -->
+    <!-- Third party libs -->       
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>de.codecentric</groupId>
+      <artifactId>spring-boot-admin-starter-client</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
@@ -74,11 +82,10 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-collections4</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
+   <dependency>
+        <groupId>org.hibernate.validator</groupId>
+        <artifactId>hibernate-validator</artifactId>
+    </dependency>    
 
 
     <!-- Testing -->
@@ -104,8 +111,63 @@
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-tomcat</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>at.gv.egiz.eaaf</groupId>
+      <artifactId>eaaf-springboot-utils</artifactId>
+      <scope>test</scope>
+    </dependency>     
 
   </dependencies>
+  
+  <profiles>
+    <profile>
+     <id>default</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+        <property>
+          <name>default</name>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-web</artifactId>
+          <exclusions>
+            <exclusion>
+              <groupId>org.springframework.boot</groupId>
+              <artifactId>spring-boot-starter-tomcat</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency> 
+        
+        <dependency>
+          <groupId>javax.servlet</groupId>
+          <artifactId>javax.servlet-api</artifactId>
+          <scope>provided</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+     <id>embbededTomcat</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-web</artifactId>
+        </dependency> 
+        <dependency>
+          <groupId>at.gv.egiz.eaaf</groupId>
+          <artifactId>eaaf-springboot-utils</artifactId>
+        </dependency>        
+      </dependencies>
+    </profile>
+    
+  </profiles>
+  
   <build>
     <finalName>ms_connector</finalName>
 
@@ -125,6 +187,24 @@
         </dependencies>
       </plugin>
 
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <version>2.2.6.RELEASE</version>
+        <configuration>
+          <executable>true</executable>
+          <!-- layout>ZIP</layout -->
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>build-info</goal>
+              <goal>repackage</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-- 
cgit v1.2.3


From cd0699b3ea0849214b4c35869f9eca431d00790a Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Wed, 23 Dec 2020 16:07:15 +0100
Subject: add build profiles to select Spring-Boot with or without embbeded
 Tomcat

---
 connector/pom.xml | 37 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

(limited to 'connector/pom.xml')

diff --git a/connector/pom.xml b/connector/pom.xml
index 7fbc2a36..6d3cad33 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -33,12 +33,6 @@
     <dependency>
       <groupId>at.gv.egiz.eaaf</groupId>
       <artifactId>eaaf_module_pvp2_idp</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>log4j-over-slf4j</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>at.asitplus.eidas.ms_specific</groupId>
@@ -54,6 +48,16 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-actuator</artifactId>
     </dependency>
+    <dependency>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-web</artifactId>
+          <exclusions>
+            <exclusion>
+              <groupId>org.springframework.boot</groupId>
+              <artifactId>spring-boot-starter-tomcat</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>     
     <dependency>
       <groupId>de.codecentric</groupId>
       <artifactId>spring-boot-admin-starter-client</artifactId>
@@ -74,10 +78,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-collections4</artifactId>
@@ -133,18 +133,7 @@
           <name>default</name>
         </property>
       </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-starter-web</artifactId>
-          <exclusions>
-            <exclusion>
-              <groupId>org.springframework.boot</groupId>
-              <artifactId>spring-boot-starter-tomcat</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency> 
-        
+      <dependencies>        
         <dependency>
           <groupId>javax.servlet</groupId>
           <artifactId>javax.servlet-api</artifactId>
@@ -157,8 +146,8 @@
       <dependencies>
         <dependency>
           <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-starter-web</artifactId>
-        </dependency> 
+          <artifactId>spring-boot-starter-tomcat</artifactId>
+        </dependency>
         <dependency>
           <groupId>at.gv.egiz.eaaf</groupId>
           <artifactId>eaaf-springboot-utils</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

---
 connector/pom.xml | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'connector/pom.xml')

diff --git a/connector/pom.xml b/connector/pom.xml
index 6d3cad33..03492a5d 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -99,6 +99,11 @@
       <artifactId>spring-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+    </dependency>    
     <dependency>
       <groupId>at.gv.egiz.eaaf</groupId>
       <artifactId>eaaf_core_utils</artifactId>
@@ -111,6 +116,11 @@
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
+    <dependency>
+      <groupId>at.gv.egiz.eaaf</groupId>
+      <artifactId>eaaf_module_pvp2_sp</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-tomcat</artifactId>
@@ -121,7 +131,23 @@
       <artifactId>eaaf-springboot-utils</artifactId>
       <scope>test</scope>
     </dependency>     
-
+    <dependency>
+      <groupId>com.github.skjolber</groupId>
+      <artifactId>mockito-soap-cxf</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <version>2.0.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-mockito2</artifactId>
+      <version>2.0.7</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   
   <profiles>
-- 
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

---
 connector/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'connector/pom.xml')

diff --git a/connector/pom.xml b/connector/pom.xml
index 03492a5d..2484e542 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -148,6 +148,11 @@
       <version>2.0.7</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>mockwebserver</artifactId>
+      <scope>test</scope>
+    </dependency>    
   </dependencies>
   
   <profiles>
-- 
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

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

(limited to 'connector/pom.xml')

diff --git a/connector/pom.xml b/connector/pom.xml
index 2484e542..36a6d9df 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -12,7 +12,7 @@
   <groupId>at.asitplus.eidas.ms_specific</groupId>
   <artifactId>ms_specific_connector</artifactId>
   <packaging>war</packaging>
-  <name>Connector Maven Webapp</name>
+  <name>MS-specific eIDAS Service</name>
   <url>http://maven.apache.org</url>
 
   <dependencies>
-- 
cgit v1.2.3