mirror/DisCal-Discord-Bot
1
0
Fork 0
mirror of https://github.com/DreamExposure/DisCal-Discord-Bot.git synced 2026-02-08 04:19:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation issues due to weird plugin version shenanigans

Browse Source
This commit is contained in:
NovaFox161
2020-05-14 18:21:45 -05:00
parent 4114c33409
commit 1c7500a7ec
4 changed files with 64 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
client/pom.xml
View File

@@ -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>

1
pom.xml
View File

@@ -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>

1
server/pom.xml
View File

@@ -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>

1
web/pom.xml
View File

@@ -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>