From 94d91bbb3146a82b6945d074f07090084c287184 Mon Sep 17 00:00:00 2001
From: Telesphoreo <craftyswans@gmail.com>
Date: Wed, 8 Aug 2018 13:05:57 -0700
Subject: [PATCH] -1 file (#117)

* hippity hoppity git no longer has properties

* for some reason it has to be there

* Build properties wont refresh?
---
 .gitignore                                    |  1 -
 TotalFreedomMod.iml                           |  2 +-
 pom.xml                                       | 97 +++++++++----------
 .../totalfreedommod/TotalFreedomMod.java      | 18 +---
 4 files changed, 49 insertions(+), 69 deletions(-)

diff --git a/.gitignore b/.gitignore
index 961baaa6..8a782aff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 # TFM excludes
 build.properties
-git.properties
 
 # Netbeans excludes
 /nbproject/private
diff --git a/TotalFreedomMod.iml b/TotalFreedomMod.iml
index 02d38e68..75e5765c 100644
--- a/TotalFreedomMod.iml
+++ b/TotalFreedomMod.iml
@@ -11,6 +11,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: org.bstats:bstats-bukkit:1.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldedit:worldedit-bukkit:7.0.0-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.13-R0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.Pravian:Aero:5f82926" level="project" />
@@ -59,7 +60,6 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: net.coreprotect:coreprotect:2.15.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldedit:worldedit-bukkit:7.0.0-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldguard:worldguard-legacy:6.2" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d51671ab..995dd1c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
         <tfm.build.number>${maven.buildnumber}</tfm.build.number>
         <tfm.build.date>${maven.build.timestamp}</tfm.build.date>
         <tfm.build.author>${buildAuthor}</tfm.build.author>
-        <tfm.build.head>${buildHead}</tfm.build.head>
+        <tfm.build.head>${git.commit.id.abbrev}</tfm.build.head>
         <jar.finalName>${project.name}</jar.finalName>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>MM/dd/yyyy HH:mm</maven.build.timestamp.format>
@@ -198,6 +198,47 @@
                 </configuration>
             </plugin>
 
+            <!-- Git describe -->
+            <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>2.2.4</version>
+                <executions>
+                    <execution>
+                        <id>get-the-git-infos</id>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>validate-the-git-infos</id>
+                        <goals>
+                            <goal>validateRevision</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+                    <prefix>git</prefix>
+                    <dateFormat>yyyy-MM-dd HH:mm:ss</dateFormat>
+                    <verbose>false</verbose>
+                    <format>properties</format>
+                    <failOnNoGitDirectory>false</failOnNoGitDirectory>
+                    <failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
+                    <includeOnlyProperties>
+                        <includeOnlyProperty>git.commit.id.abbrev</includeOnlyProperty>
+                    </includeOnlyProperties>
+                    <gitDescribe>
+                        <skip>false</skip>
+                        <always>false</always>
+                        <abbrev>7</abbrev>
+                        <dirty>-dirty</dirty>
+                        <match>*</match>
+                    </gitDescribe>
+                </configuration>
+            </plugin>
+
             <!-- Antrun -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -205,16 +246,18 @@
                 <version>1.8</version>
                 <executions>
                     <execution>
+                        <id>default-cli</id>
                         <phase>initialize</phase>
                         <configuration>
                             <target>
-                                <propertyfile file="src/main/resources/build.properties"
+                                <propertyfile file="${project.basedir}/src/main/resources/build.properties"
                                               comment="Build information. Edit this to your liking.">
                                     <entry key="buildAuthor" default="unknown"/>
                                     <entry key="buildNumber" default="0"/>
                                     <entry key="buildCodeName" default="${tfm.build.codename}"/>
                                     <entry key="buildVersion" default="${project.version}"/>
                                     <entry key="buildDate" default="${timestamp}"/>
+                                    <entry key="buildHead" default="${git.commit.id.abbrev}"/>
                                 </propertyfile>
                             </target>
                         </configuration>
@@ -239,7 +282,7 @@
                         </goals>
                         <configuration>
                             <files>
-                                <file>${basedir}/src/main/resources/build.properties</file>
+                                <file>${project.basedir}/src/main/resources/build.properties</file>
                             </files>
                         </configuration>
                     </execution>
@@ -267,52 +310,6 @@
                 </configuration>
             </plugin>
 
-            <!-- Git describe -->
-            <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
-                <version>2.2.4</version>
-                <executions>
-                    <execution>
-                        <id>get-the-git-infos</id>
-                        <goals>
-                            <goal>revision</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>validate-the-git-infos</id>
-                        <goals>
-                            <goal>validateRevision</goal>
-                        </goals>
-                        <phase>package</phase>
-                    </execution>
-                </executions>
-                <configuration>
-                    <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
-                    <prefix>git</prefix>
-                    <dateFormat>yyyy-MM-dd HH:mm:ss</dateFormat>
-                    <verbose>false</verbose>
-                    <generateGitPropertiesFile>true</generateGitPropertiesFile>
-                    <generateGitPropertiesFilename>${basedir}/src/main/resources/git.properties
-                    </generateGitPropertiesFilename>
-                    <format>properties</format>
-                    <failOnNoGitDirectory>false</failOnNoGitDirectory>
-                    <failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
-                    <includeOnlyProperties>
-                        <includeOnlyProperty>git.build.time</includeOnlyProperty>
-                        <includeOnlyProperty>git.commit.id</includeOnlyProperty>
-                        <includeOnlyProperty>git.commit.id.abbrev</includeOnlyProperty>
-                    </includeOnlyProperties>
-                    <gitDescribe>
-                        <skip>false</skip>
-                        <always>false</always>
-                        <abbrev>7</abbrev>
-                        <dirty>-dirty</dirty>
-                        <match>*</match>
-                    </gitDescribe>
-                </configuration>
-            </plugin>
-
             <!-- Buildnumber -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -329,7 +326,7 @@
 
                 <configuration>
                     <buildNumberPropertyName>maven.buildnumber</buildNumberPropertyName>
-                    <buildNumberPropertiesFileLocation>${basedir}/src/main/resources/build.properties
+                    <buildNumberPropertiesFileLocation>${project.basedir}/src/main/resources/build.properties
                     </buildNumberPropertiesFileLocation>
                     <format>{0,number,#}</format>
                     <items>
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java b/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java
index c8c0c7e9..35e4e046 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java
@@ -310,29 +310,13 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
                 version = props.getProperty("buildVersion", pluginVersion);
                 number = props.getProperty("buildNumber", "1");
                 date = props.getProperty("buildDate", "unknown");
+                head = props.getProperty("buildHead", "unknown");
             }
             catch (Exception ex)
             {
                 FLog.severe("Could not load build properties! Did you compile with NetBeans/Maven?");
                 FLog.severe(ex);
             }
-            try
-            {
-                final Properties gitprops;
-
-                try (InputStream in = plugin.getResource("git.properties"))
-                {
-                    gitprops = new Properties();
-                    gitprops.load(in);
-                }
-
-                head = gitprops.getProperty("git.commit.id.abbrev", "unknown");
-            }
-            catch (Exception ex)
-            {
-                FLog.severe("Could not load Git properties! Is there a valid .git directory?");
-                FLog.severe(ex);
-            }
         }
 
         public String formattedVersion()