From e37292267b763862a21e89e4e8247d0e739646d0 Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Mon, 30 Aug 2021 20:33:55 -0400
Subject: [PATCH] use maven's native reproducible build support

Co-authored-by: Max Weber <mii7303@gmail.com>
---
 pom.xml                                  | 32 +++++++++++++-----------
 runelite-client/pom.xml                  |  7 +-----
 runelite-script-assembler-plugin/pom.xml |  1 -
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index e99b83af3d..d487454096 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.build.outputTimestamp>1</project.build.outputTimestamp>
 		<java.version>1.8</java.version>
 		<java.release>8</java.release>
 		<lombok.version>1.18.20</lombok.version>
@@ -280,33 +281,34 @@
 					<includeTestSourceDirectory>true</includeTestSourceDirectory>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>io.github.zlika</groupId>
-				<artifactId>reproducible-build-maven-plugin</artifactId>
-				<version>0.7</version>
-				<executions>
-					<execution>
-						<!-- Move from pre-integration-test to place before jarsigning -->
-						<phase>package</phase>
-						<goals>
-							<goal>strip-jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-assembly-plugin</artifactId>
+					<version>3.2.0</version>
+				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.0.2</version>
+					<version>3.2.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.6.1</version>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>2.8.2</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-plugin-plugin</artifactId>
+					<version>3.6.0</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>
diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml
index a6b0870fb4..debecf5638 100644
--- a/runelite-client/pom.xml
+++ b/runelite-client/pom.xml
@@ -318,7 +318,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.2.1</version>
+				<version>3.2.3</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -338,11 +338,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<!-- Strip jar before signing -->
-			<plugin>
-				<groupId>io.github.zlika</groupId>
-				<artifactId>reproducible-build-maven-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jarsigner-plugin</artifactId>
diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml
index f79c779388..393e17c640 100644
--- a/runelite-script-assembler-plugin/pom.xml
+++ b/runelite-script-assembler-plugin/pom.xml
@@ -65,7 +65,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-plugin-plugin</artifactId>
-				<version>3.4</version>
 				<executions>
 					<execution>
 						<id>default-descriptor</id>