From 1cb085af13a281f491b85a24043b9b0bad841b50 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Mon, 13 Feb 2017 19:30:17 -0500
Subject: [PATCH] http api: use a filtered properties file to get version
 instead, which seems to work more reliably

---
 http-api/pom.xml                              | 20 +++++---------
 .../net/runelite/http/api/RuneliteAPI.java    | 26 ++++++++++++++++++-
 .../src/main/resources/runelite.properties    |  1 +
 3 files changed, 32 insertions(+), 15 deletions(-)
 create mode 100644 http-api/src/main/resources/runelite.properties

diff --git a/http-api/pom.xml b/http-api/pom.xml
index 926f66ef33..17fe2c3a60 100644
--- a/http-api/pom.xml
+++ b/http-api/pom.xml
@@ -66,19 +66,11 @@
 	</dependencies>
 
 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-							<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
-		</plugins>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
 	</build>
 </project>
diff --git a/http-api/src/main/java/net/runelite/http/api/RuneliteAPI.java b/http-api/src/main/java/net/runelite/http/api/RuneliteAPI.java
index a90557c7ff..35a90a6e75 100644
--- a/http-api/src/main/java/net/runelite/http/api/RuneliteAPI.java
+++ b/http-api/src/main/java/net/runelite/http/api/RuneliteAPI.java
@@ -24,10 +24,34 @@
  */
 package net.runelite.http.api;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class RuneliteAPI
 {
+	private static final Logger logger = LoggerFactory.getLogger(RuneliteAPI.class);
+
 	private static final String BASE = "https://api.runelite.net/runelite-";
-	private static String version = RuneliteAPI.class.getPackage().getImplementationVersion();
+	private static final Properties properties = new Properties();
+	private static String version;
+
+	static
+	{
+		try
+		{
+			InputStream in = RuneliteAPI.class.getResourceAsStream("/runelite.properties");
+			properties.load(in);
+
+			version = properties.getProperty("runelite.version");
+		}
+		catch (IOException ex)
+		{
+			logger.error(null, ex);
+		}
+	}
 
 	public static String getApiBase()
 	{
diff --git a/http-api/src/main/resources/runelite.properties b/http-api/src/main/resources/runelite.properties
new file mode 100644
index 0000000000..b26062dfdf
--- /dev/null
+++ b/http-api/src/main/resources/runelite.properties
@@ -0,0 +1 @@
+runelite.version=${project.version}
\ No newline at end of file