Merge Greg's branch into the master branch #282

Merged
greg6775 merged 12 commits from greg-dev into master 2019-12-30 19:30:32 +01:00
Showing only changes of commit 4dd6b05bd0 - Show all commits

View file

@ -56,7 +56,6 @@
<artifactId>lavaplayer</artifactId> <artifactId>lavaplayer</artifactId>
<version>1.3.32</version> <version>1.3.32</version>
</dependency> </dependency>
</dependencies> </dependencies>
<repositories> <repositories>
@ -78,10 +77,6 @@
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version> <version>3.1.0</version>
</plugin> </plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</plugin>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version> <version>2.22.2</version>
@ -120,6 +115,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration> <configuration>
<source>13</source> <source>13</source>
<target>13</target> <target>13</target>