From f27034bb35a85ec040a5759d79ae036910e6b514 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Thu, 26 Jan 2017 13:55:06 +0000
Subject: [PATCH] Pull git commit id once only - should improve build time

---
 bukkit-legacy/pom.xml                         | 23 ++---------------
 bukkit/pom.xml                                | 18 ++-----------
 bukkit/src/main/resources/plugin.yml          |  2 +-
 bungee/pom.xml                                | 18 ++-----------
 bungee/src/main/resources/plugin.yml          |  2 +-
 pom.xml                                       | 24 ++++++++++++++++++
 sponge/pom.xml                                | 25 ++-----------------
 .../luckperms/sponge/utils/VersionData.java   |  2 +-
 8 files changed, 35 insertions(+), 79 deletions(-)

diff --git a/bukkit-legacy/pom.xml b/bukkit-legacy/pom.xml
index 14c66c1c9..8c5f009a9 100644
--- a/bukkit-legacy/pom.xml
+++ b/bukkit-legacy/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>luckperms-bukkit-legacy</artifactId>
     <build>
         <defaultGoal>clean package</defaultGoal>
-        <finalName>LuckPerms-Bukkit-Legacy-${release.version}.${git.closest.tag.commit.count}</finalName>
+        <finalName>LuckPerms-Bukkit-Legacy-${release.version}.${patch.version}</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -48,11 +48,7 @@
                         </goals>
                         <configuration>
                             <minimizeJar>false</minimizeJar>
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>org.xerial:*</exclude>
-                                </excludes>
-                            </artifactSet>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                             <relocations>
                                 <relocation>
                                     <pattern>com.google.common</pattern>
@@ -71,21 +67,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>revision</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <injectAllReactorProjects>true</injectAllReactorProjects>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index 6f81b7533..2743189b7 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -14,7 +14,7 @@
 
     <build>
         <defaultGoal>clean package</defaultGoal>
-        <finalName>LuckPerms-Bukkit-${release.version}.${git.closest.tag.commit.count}</finalName>
+        <finalName>LuckPerms-Bukkit-${release.version}.${patch.version}</finalName>
         <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
         <resources>
             <resource>
@@ -51,6 +51,7 @@
                         </goals>
                         <configuration>
                             <minimizeJar>false</minimizeJar>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                             <relocations>
                                 <relocation>
                                     <pattern>io.github.mkremins.fanciful</pattern>
@@ -61,21 +62,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>revision</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <injectAllReactorProjects>true</injectAllReactorProjects>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml
index abfd42219..6aa0b1c43 100644
--- a/bukkit/src/main/resources/plugin.yml
+++ b/bukkit/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: LuckPerms
-version: ${release.version}.${git.closest.tag.commit.count}
+version: ${release.version}.${patch.version}
 description: A permissions plugin
 author: Luck
 website: https://github.com/lucko/LuckPerms
diff --git a/bungee/pom.xml b/bungee/pom.xml
index 19c64e5f1..216301b16 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -14,7 +14,7 @@
 
     <build>
         <defaultGoal>clean package</defaultGoal>
-        <finalName>LuckPerms-Bungee-${release.version}.${git.closest.tag.commit.count}</finalName>
+        <finalName>LuckPerms-Bungee-${release.version}.${patch.version}</finalName>
         <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
         <resources>
             <resource>
@@ -51,6 +51,7 @@
                         </goals>
                         <configuration>
                             <minimizeJar>false</minimizeJar>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                             <relocations>
                                 <relocation>
                                     <pattern>io.github.mkremins.fanciful</pattern>
@@ -61,21 +62,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>revision</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <injectAllReactorProjects>true</injectAllReactorProjects>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/bungee/src/main/resources/plugin.yml b/bungee/src/main/resources/plugin.yml
index 5210fede3..50cf41626 100644
--- a/bungee/src/main/resources/plugin.yml
+++ b/bungee/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: LuckPerms
-version: ${release.version}.${git.closest.tag.commit.count}
+version: ${release.version}.${patch.version}
 description: A permissions plugin
 author: Luck
 main: me.lucko.luckperms.bungee.LPBungeePlugin
diff --git a/pom.xml b/pom.xml
index 440f786ad..136bb04c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <release.version>2.17</release.version>
+        <patch.version>${git.closest.tag.commit.count}</patch.version>
     </properties>
 
     <distributionManagement>
@@ -52,6 +53,29 @@
         </repository>
     </distributionManagement>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>2.2.1</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <skipPoms>false</skipPoms>
+                    <injectAllReactorProjects>true</injectAllReactorProjects>
+                    <runOnlyOnce>true</runOnlyOnce>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <repositories>
         <repository>
             <id>spigot-repo</id>
diff --git a/sponge/pom.xml b/sponge/pom.xml
index c4ed5aafa..7a79e7241 100644
--- a/sponge/pom.xml
+++ b/sponge/pom.xml
@@ -14,7 +14,7 @@
 
     <build>
         <defaultGoal>clean package</defaultGoal>
-        <finalName>LuckPerms-Sponge-${release.version}.${git.closest.tag.commit.count}</finalName>
+        <finalName>LuckPerms-Sponge-${release.version}.${patch.version}</finalName>
         <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
         <resources>
             <resource>
@@ -51,13 +51,7 @@
                         </goals>
                         <configuration>
                             <minimizeJar>false</minimizeJar>
-                            <artifactSet>
-                                <excludes>
-                                    <exclude>org.slf4j:*</exclude>
-                                    <exclude>org.xerial:*</exclude>
-                                    <exclude>com.h2database:*</exclude>
-                                </excludes>
-                            </artifactSet>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
                             <relocations>
                                 <relocation>
                                     <pattern>io.github.mkremins.fanciful</pattern>
@@ -81,21 +75,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>revision</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <injectAllReactorProjects>true</injectAllReactorProjects>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/sponge/src/main/java-templates/me/lucko/luckperms/sponge/utils/VersionData.java b/sponge/src/main/java-templates/me/lucko/luckperms/sponge/utils/VersionData.java
index ea298f004..4be3d8355 100644
--- a/sponge/src/main/java-templates/me/lucko/luckperms/sponge/utils/VersionData.java
+++ b/sponge/src/main/java-templates/me/lucko/luckperms/sponge/utils/VersionData.java
@@ -24,6 +24,6 @@ package me.lucko.luckperms.sponge.utils;
 
 public class VersionData {
 
-    public static final String VERSION = "${release.version}.${git.closest.tag.commit.count}";
+    public static final String VERSION = "${release.version}.${patch.version}";
 
 }