Merge remote-tracking branch 'upstream/master' into maven-plugin-upgrades

http-service/pom.xml

@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.24-SNAPSHOT</version>
+		<version>1.5.25-SNAPSHOT</version>
 	</parent>
 
 	<name>Web Service</name>

http-service/src/main/java/net/runelite/http/service/xtea/XteaService.java

@@ -184,9 +184,9 @@ public class XteaService
 		try (Connection con = sql2o.open())
 		{
 			return con.createQuery(
-				"select t1.region, t1.time, t2.rev, t2.key1, t2.key2, t2.key3, t2.key4 from " +
-					"(select region,max(time) as time from xtea group by region) t1 " +
-					"join xtea t2 on t1.region = t2.region and t1.time = t2.time")
+				"select t1.region, t2.time, t2.rev, t2.key1, t2.key2, t2.key3, t2.key4 from " +
+					"(select region,max(id) as id from xtea group by region) t1 " +
+					"join xtea t2 on t1.id = t2.id")
 				.executeAndFetch(XteaEntry.class);
 		}
 	}