From 05883787daff5b60f36a82c1bd544d10fbdd08aa Mon Sep 17 00:00:00 2001
From: Richard Richter <richard.richter@evolveum.com>
Date: Thu, 9 Apr 2020 12:28:25 +0200
Subject: [PATCH] POM fixes after master merge, fixed falsely reported used
 tomcat

---
 gui/admin-gui/pom.xml   | 5 -----
 model/rest-impl/pom.xml | 4 ----
 pom.xml                 | 4 ++++
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
index 6e67779ad14..a9bb178452d 100644
--- a/gui/admin-gui/pom.xml
+++ b/gui/admin-gui/pom.xml
@@ -357,11 +357,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency> <!-- needed as runtime dependency otherwise spring won't start -->
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aspects</artifactId>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
diff --git a/model/rest-impl/pom.xml b/model/rest-impl/pom.xml
index 4ede679178f..98be421433f 100644
--- a/model/rest-impl/pom.xml
+++ b/model/rest-impl/pom.xml
@@ -55,10 +55,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
diff --git a/pom.xml b/pom.xml
index e4635172e98..44441820a0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1768,6 +1768,7 @@
                                 <ignoredUsedUndeclaredDependency>org.slf4j:jcl-over-slf4j</ignoredUsedUndeclaredDependency>
                                 <ignoredUsedUndeclaredDependency>org.slf4j:slf4j-api</ignoredUsedUndeclaredDependency>
                                 <ignoredUsedUndeclaredDependency>org.danekja:jdk-serializable-functional</ignoredUsedUndeclaredDependency>
+                                <ignoredUsedUndeclaredDependency>org.apache.tomcat.embed:tomcat-embed-core</ignoredUsedUndeclaredDependency>
                             </ignoredUsedUndeclaredDependencies>
                         </configuration>
                     </execution>
@@ -1782,7 +1783,9 @@
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <version>${checkstyle.version}</version>
                 <configuration>
+                    <!--suppress MavenModelInspection: provided by mvn(w)/IDE/Jenkins -->
                     <configLocation>${maven.multiModuleProjectDirectory}/config/checkstyle/checkstyle.xml</configLocation>
+                    <!--suppress MavenModelInspection: provided by mvn(w)/IDE/Jenkins -->
                     <suppressionsLocation>${maven.multiModuleProjectDirectory}/config/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
                     <encoding>UTF-8</encoding>
                     <consoleOutput>true</consoleOutput>
@@ -2025,6 +2028,7 @@
                 <!-- TODO: unify with other checkstyle setup in pluginManagement? -->
                 <version>${checkstyle.version}</version>
                 <configuration>
+                    <!--suppress MavenModelInspection: provided by mvn(w)/IDE/Jenkins -->
                     <configLocation>${maven.multiModuleProjectDirectory}/build-system/checkstyle-configs/checkstyle.xml</configLocation>
                     <!-- TODO: what about suppressions? without them and with failsOnError true it must fail, or not? -->
                     <encoding>UTF-8</encoding>