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