Merge branch 'feature/springboot' into 'nightlybuild'

Feature/springboot

See merge request egiz/eidas_at_proxy!7

1 files changed, 133 insertions, 3 deletions

diff --git a/pom.xml b/pom.xml
index c360f910..46d02706 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,20 +10,28 @@
 
   <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>
 
 
     <!-- ===================================================================== -->
     <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</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>
 
+    <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,12 +39,16 @@
     <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 -->
 
+    <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>
     <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>
@@ -121,6 +133,11 @@
       </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>
         <version>${eaaf-core.version}</version>
       </dependency>
@@ -146,9 +163,66 @@
         <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>
+        <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>
         <version>${org.springframework.version}</version>
@@ -219,6 +293,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 -->
@@ -235,6 +319,12 @@
         <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>
         <version>${mockito-soap-cxf.version}</version>
@@ -254,6 +344,25 @@
         <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>
+        <version>${egiz.eidas.version}</version>
+        <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>
@@ -277,8 +386,29 @@
             <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>
           <version>${cxf.version}</version>