From a92084ec606332070bbd1d3bf2107afe21bf2249 Mon Sep 17 00:00:00 2001
From: sgdc3 <sgdc3.mail@gmail.com>
Date: Mon, 29 Jan 2018 15:08:59 +0100
Subject: [PATCH] Fix the deploy system

---
 pom.xml                                       | 141 +++++++++++++-----
 .../fr/xephi/authme/datasource/SQLite.java    |   1 +
 .../authme/permission/PermissionsManager.java |   8 +-
 3 files changed, 105 insertions(+), 45 deletions(-)

diff --git a/pom.xml b/pom.xml
index f247c2057..d1af1e89f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,17 @@
         <url>https://github.com/AuthMe/AuthMeReloaded/issues</url>
     </issueManagement>
 
+    <distributionManagement>
+        <snapshotRepository>
+            <id>codemc-snapshots</id>
+            <url>https://repo.codemc.org/repository/maven-snapshots/</url>
+        </snapshotRepository>
+        <repository>
+            <id>codemc-releases</id>
+            <url>https://repo.codemc.org/repository/maven-releases/</url>
+        </repository>
+    </distributionManagement>
+
     <licenses>
         <license>
             <name>The GNU General Public Licence version 3 (GPLv3)</name>
@@ -46,15 +57,17 @@
     <properties>
         <!-- Project properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <jdk.version>1.8</jdk.version>
 
         <!-- Output properties -->
+        <project.outputName>AuthMe</project.outputName>
         <project.buildNumber>CUSTOM</project.buildNumber>
         <project.skipExtendedHashTests>false</project.skipExtendedHashTests>
         <project.versionCode>${project.version}-b${project.buildNumber}</project.versionCode>
 
         <!-- BukkitPlugin properties -->
-        <bukkitplugin.name>AuthMe</bukkitplugin.name>
+        <bukkitplugin.name>${project.outputName}</bukkitplugin.name>
         <bukkitplugin.version>${project.versionCode}</bukkitplugin.version>
         <bukkitplugin.main>${project.groupId}.${project.artifactId}.${bukkitplugin.name}</bukkitplugin.main>
         <bukkitplugin.authors>Xephi, sgdc3, DNx5, timvisee, games647, ljacqu, Gnat008</bukkitplugin.authors>
@@ -92,6 +105,9 @@
     </profiles>
 
     <build>
+        <defaultGoal>clean install</defaultGoal>
+        <finalName>${project.outputName}-${project.version}</finalName>
+
         <resources>
             <resource>
                 <directory>.</directory>
@@ -112,7 +128,16 @@
         </resources>
 
         <plugins>
-            <!-- Maven Java Compiler -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.0.0</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.0.2</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -122,7 +147,25 @@
                     <target>${jdk.version}</target>
                 </configuration>
             </plugin>
-            <!-- Test Plugin -->
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.0</version>
+                <executions>
+                    <execution>
+                        <id>pre-unit-test</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>post-unit-test</id>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -135,13 +178,47 @@
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
-            <!-- Libs Shading and Relocation -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.0.2</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.4</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>aggregate</goal>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <show>public</show>
+                    <failOnError>false</failOnError>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>3.1.0</version>
                 <executions>
-                    <!-- Run shade goal on package phase -->
                     <execution>
                         <phase>package</phase>
                         <goals>
@@ -206,48 +283,36 @@
                     </relocations>
                 </configuration>
             </plugin>
-            <!-- Coverage report generator -->
             <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.0</version>
-                <executions>
-                    <execution>
-                        <id>prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.5.2</version>
+                <configuration>
+                    <pomFile>pom.xml</pomFile>
+                    <file>original-${project.outputName}.jar</file>
+                    <javadoc>${project.outputName}-javadoc.jar</javadoc>
+                    <sources>${project.outputName}-sources.jar</sources>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+                <configuration>
+                    <pomFile>pom.xml</pomFile>
+                    <file>original-${project.outputName}.jar</file>
+                    <javadoc>${project.outputName}-javadoc.jar</javadoc>
+                    <sources>${project.outputName}-sources.jar</sources>
+                </configuration>
             </plugin>
-            <!-- Coverage report uploader -->
             <plugin>
                 <groupId>org.eluder.coveralls</groupId>
                 <artifactId>coveralls-maven-plugin</artifactId>
                 <version>4.3.0</version>
                 <configuration>
+                    <!-- The secret token is provided with a command-line parameter! -->
                     <failOnServiceError>false</failOnServiceError>
                 </configuration>
-                <!-- The secret token is provided with a command-line parameter! -->
-            </plugin>
-            <!-- JavaDocs generator -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
-                <configuration>
-                    <show>public</show>
-                    <failOnError>false</failOnError>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/src/main/java/fr/xephi/authme/datasource/SQLite.java b/src/main/java/fr/xephi/authme/datasource/SQLite.java
index 4924e0cc0..422d57b17 100644
--- a/src/main/java/fr/xephi/authme/datasource/SQLite.java
+++ b/src/main/java/fr/xephi/authme/datasource/SQLite.java
@@ -41,6 +41,7 @@ public class SQLite implements DataSource {
      * Constructor for SQLite.
      *
      * @param settings The settings instance
+     * @param dataFolder The data folder
      *
      * @throws SQLException when initialization of a SQL datasource failed
      */
diff --git a/src/main/java/fr/xephi/authme/permission/PermissionsManager.java b/src/main/java/fr/xephi/authme/permission/PermissionsManager.java
index 734331fd8..ef9d8bdde 100644
--- a/src/main/java/fr/xephi/authme/permission/PermissionsManager.java
+++ b/src/main/java/fr/xephi/authme/permission/PermissionsManager.java
@@ -50,14 +50,8 @@ public class PermissionsManager implements Reloadable {
      */
     private PermissionHandler handler = null;
 
-    /**
-     * Constructor.
-     *
-     * @param server Server instance
-     * @param pluginManager Bukkit plugin manager
-     */
     @Inject
-    public PermissionsManager(Server server, PluginManager pluginManager, Settings settings) {
+    PermissionsManager(Server server, PluginManager pluginManager, Settings settings) {
         this.server = server;
         this.pluginManager = pluginManager;
         this.settings = settings;