From 42561f210bc037db2adb70ce80cbeedd781dfffd Mon Sep 17 00:00:00 2001
From: kochetkov <s.kochetkov@micord.ru>
Date: Wed, 25 Sep 2024 10:34:43 +0300
Subject: [PATCH] revert to spring boot jar

---
 config-data-executor/pom.xml                  | 27 ++++++++++++++-----
 .../src/main/java/org/micord/Main.java        |  2 +-
 .../micord/SpringBootTomcatApplication.java   | 16 +++++------
 .../org/micord/config/AtomikosConfig.java     |  1 -
 4 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/config-data-executor/pom.xml b/config-data-executor/pom.xml
index bab5c97..49b3486 100644
--- a/config-data-executor/pom.xml
+++ b/config-data-executor/pom.xml
@@ -7,7 +7,7 @@
   <groupId>org.micord</groupId>
   <artifactId>config-data-executor</artifactId>
   <version>1.0-SNAPSHOT</version>
-  <packaging>war</packaging>
+<!--  <packaging>war</packaging>-->
 
   <properties>
     <maven.compiler.source>17</maven.compiler.source>
@@ -44,12 +44,12 @@
     <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>
+<!--      <exclusions>-->
+<!--        <exclusion>-->
+<!--          <groupId>org.springframework.boot</groupId>-->
+<!--          <artifactId>spring-boot-starter-tomcat</artifactId>-->
+<!--        </exclusion>-->
+<!--      </exclusions>-->
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -101,6 +101,11 @@
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-java-sdk-s3</artifactId>
     </dependency>
+<!--    <dependency>-->
+<!--      <groupId>jakarta.servlet</groupId>-->
+<!--      <artifactId>jakarta.servlet-api</artifactId>-->
+<!--      <scope>provided</scope>-->
+<!--    </dependency>-->
   </dependencies>
   <repositories>
     <repository>
@@ -112,6 +117,14 @@
   <build>
     <finalName>${artifactId}</finalName>
     <plugins>
+<!--      <plugin>-->
+<!--        <groupId>org.apache.maven.plugins</groupId>-->
+<!--        <artifactId>maven-war-plugin</artifactId>-->
+<!--        <version>3.1.0</version>-->
+<!--        <configuration>-->
+<!--          <failOnMissingWebXml>false</failOnMissingWebXml>-->
+<!--        </configuration>-->
+<!--      </plugin>-->
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/config-data-executor/src/main/java/org/micord/Main.java b/config-data-executor/src/main/java/org/micord/Main.java
index b37af38..7d795d5 100644
--- a/config-data-executor/src/main/java/org/micord/Main.java
+++ b/config-data-executor/src/main/java/org/micord/Main.java
@@ -12,4 +12,4 @@ public class Main {
 	public static void main(String[] args) {
 		SpringApplication.run(Main.class, args);
 	}
-}
\ No newline at end of file
+}
diff --git a/config-data-executor/src/main/java/org/micord/SpringBootTomcatApplication.java b/config-data-executor/src/main/java/org/micord/SpringBootTomcatApplication.java
index 3c15e47..0afa840 100644
--- a/config-data-executor/src/main/java/org/micord/SpringBootTomcatApplication.java
+++ b/config-data-executor/src/main/java/org/micord/SpringBootTomcatApplication.java
@@ -1,8 +1,8 @@
-package org.micord;
-
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
-@SpringBootApplication
-public class SpringBootTomcatApplication extends SpringBootServletInitializer {
-}
+//package org.micord;
+//
+//import org.springframework.boot.autoconfigure.SpringBootApplication;
+//import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+//
+//@SpringBootApplication
+//public class SpringBootTomcatApplication extends SpringBootServletInitializer {
+//}
diff --git a/config-data-executor/src/main/java/org/micord/config/AtomikosConfig.java b/config-data-executor/src/main/java/org/micord/config/AtomikosConfig.java
index e6cb7e7..590cdd7 100644
--- a/config-data-executor/src/main/java/org/micord/config/AtomikosConfig.java
+++ b/config-data-executor/src/main/java/org/micord/config/AtomikosConfig.java
@@ -36,4 +36,3 @@ public class AtomikosConfig {
 	}
 
 }
-