From 98bc9633be6392244dea25c9b839044b9a2469f0 Mon Sep 17 00:00:00 2001
From: L_DelOff <l_deloff@ldeloff.ru>
Date: Mon, 20 Nov 2023 21:47:54 +0300
Subject: [PATCH] CI/CD fix

---
 Jenkinsfile_CD                     |  2 +-
 Jenkinsfile_CI                     |  2 +-
 pom.xml                            | 23 ++++++++++++-----------
 src/main/resources/application.yml |  6 +++---
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD
index 87ea5d9..07e1a36 100644
--- a/Jenkinsfile_CD
+++ b/Jenkinsfile_CD
@@ -19,7 +19,7 @@ pipeline {
     stages {
         stage('Build') {
             steps {
-                sh 'mvn -B -DskipTests -X clean install'
+                sh 'mvn -B -DskipTests -X clean package spring-boot:repackage'
             }
         }
         stage('Deploy') {
diff --git a/Jenkinsfile_CI b/Jenkinsfile_CI
index 1705ce0..aad584a 100644
--- a/Jenkinsfile_CI
+++ b/Jenkinsfile_CI
@@ -8,7 +8,7 @@ pipeline {
     stages {
         stage('Build') {
             steps {
-                sh 'mvn -B -DskipTests -X clean install'
+                sh 'mvn -B -DskipTests -X clean package spring-boot:repackage'
             }
         }
         stage('Build docker') {
diff --git a/pom.xml b/pom.xml
index ba60177..d8cbe86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
         <db.url>${database.url}</db.url>
         <db.user>${database.username}</db.user>
         <db.password>${database.password}</db.password>
+        <start-class>ru.ldeloff.servermonitorbot.ServerMonitorBotApplication</start-class>
     </properties>
     <dependencies>
         <dependency>
@@ -100,19 +101,19 @@
                 </configuration>
             </plugin>
             <plugin>
-                <!-- Build an executable JAR -->
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.0</version>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>lib/</classpathPrefix>
-                            <mainClass>ru.ldeloff.servermonitorbot.ServerMonitorBotApplication</mainClass>
-                        </manifest>
-                    </archive>
+                    <mainClass>ru.ldeloff.servermonitorbot.ServerMonitorBotApplication</mainClass>
+                    <layout>JAR</layout>
                 </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 21fe203..023e736 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,9 +2,9 @@ spring:
   application:
     name: ServerMonitorBot
   datasource:
-    url: @db.url@
-    username: @db.username@
-    password: @db.password@
+    url: @database.url@
+    username: @database.username@
+    password: @database.password@
   jpa:
     hibernate:
       ddl-auto: none