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