From e7b1b892713290558e8cffbd643caf554e905b50 Mon Sep 17 00:00:00 2001
From: Matteo Steccolini <stmsat@gmail.com>
Date: Wed, 3 Jan 2024 08:45:48 +0100
Subject: [PATCH] reverting profiles to the current situation in the master
 branch: spring-boot:run by defaults starts tomcat, while the jetty profile
 enables jetty

added a fix to run the generated war with spring-boot on tomcat, due to issues with spring-boot 3.2.0 https://github.com/spring-projects/spring-boot/issues/38585
the jar generated with jetty doesn't work at the moment
---
 pom.xml | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index c452a72..facd1d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -387,6 +387,14 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <!--
+                    java -jar ROOT.war doesn't work; there is a bug in spring-boot-3.2.0 due to hibernate search,
+                    probably solved in 3.2.1 https://github.com/spring-projects/spring-boot/issues/38585
+                    (at the moment only tomcat works)
+                    -->
+                    <loaderImplementation>CLASSIC</loaderImplementation>
+                </configuration>
                 <executions>
                     <execution>
                         <goals>
@@ -567,12 +575,6 @@
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-web</artifactId>
                     <version>${spring_boot_version}</version>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>org.springframework.boot</groupId>
-                            <artifactId>spring-boot-starter-tomcat</artifactId>
-                        </exclusion>
-                    </exclusions>
                 </dependency>
             </dependencies>
         </profile>
@@ -599,15 +601,6 @@
                     <version>${spring_boot_version}</version>
                 </dependency>
             </dependencies>
-        </profile><profile>
-            <id>tomcat</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-web</artifactId>
-                    <version>${spring_boot_version}</version>
-                </dependency>
-            </dependencies>
         </profile>
         <profile>
             <id>ossrh-repo</id>