From 1c7500a7ecca94ebc200c53445cb3c3aa7c10775 Mon Sep 17 00:00:00 2001
From: NovaFox161 <novamaday@gmail.com>
Date: Thu, 14 May 2020 18:21:45 -0500
Subject: [PATCH] Fix compilation issues due to weird plugin version
 shenanigans

---
 client/pom.xml | 122 ++++++++++++++++++++++++-------------------------
 pom.xml        |   1 +
 server/pom.xml |   1 +
 web/pom.xml    |   1 +
 4 files changed, 64 insertions(+), 61 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index 292f6cf2..5bbae591 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -1,42 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<packaging>jar</packaging>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
 
-	<properties>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
-		<maven.compiler.testSource>1.8</maven.compiler.testSource>
+    <properties>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.testTarget>1.8</maven.compiler.testTarget>
+        <maven.compiler.testSource>1.8</maven.compiler.testSource>
 
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<project.build.targetEncoding>UTF-8</project.build.targetEncoding>
-	</properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <project.build.targetEncoding>UTF-8</project.build.targetEncoding>
+    </properties>
 
-	<parent>
-		<groupId>org.dreamexposure</groupId>
-		<artifactId>DisCal</artifactId>
-		<version>${revision}</version>
-	</parent>
+    <parent>
+        <groupId>org.dreamexposure</groupId>
+        <artifactId>DisCal</artifactId>
+        <version>${revision}</version>
+    </parent>
 
-	<groupId>org.dreamexposure.discal</groupId>
-	<artifactId>client</artifactId>
-	<version>${revision}</version>
+    <groupId>org.dreamexposure.discal</groupId>
+    <artifactId>client</artifactId>
+    <version>${revision}</version>
 
-	<dependencies>
-		<!--DisCal Core-->
-		<dependency>
-			<groupId>org.dreamexposure.discal</groupId>
-			<artifactId>core</artifactId>
-			<version>${revision}</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
+    <dependencies>
+        <!--DisCal Core-->
+        <dependency>
+            <groupId>org.dreamexposure.discal</groupId>
+            <artifactId>core</artifactId>
+            <version>${revision}</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 
-	<build>
+    <build>
         <directory>../target</directory>
         <finalName>DisCal-Client</finalName>
 
@@ -69,33 +68,34 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.0.2</version>
                 <configuration>
-					<archive>
-						<manifest>
-							<addClasspath>true</addClasspath>
-							<mainClass>org.dreamexposure.discal.client.DisCalClient</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>repackage</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <mainClass>org.dreamexposure.discal.client.DisCalClient</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring.maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.7</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f5c85794..7e7691dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,7 @@
 
         <spring.version>2.1.5.RELEASE</spring.version>
         <spring.security.version>5.1.5.RELEASE</spring.security.version>
+        <spring.maven-plugin.version>2.2.7.RELEASE</spring.maven-plugin.version>
 
         <discord4j.version>3.1.0-SNAPSHOT</discord4j.version>
 
diff --git a/server/pom.xml b/server/pom.xml
index 7b0bd9b2..a6f8c8a6 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -88,6 +88,7 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring.maven-plugin.version}</version>
 				<executions>
 					<execution>
 						<goals>
diff --git a/web/pom.xml b/web/pom.xml
index 26db75cc..b929136a 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -72,6 +72,7 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring.maven-plugin.version}</version>
 				<executions>
 					<execution>
 						<goals>