Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
at fix-function-merge 130 lines 4.9 kB view raw
1From 3f85e2754144bbf2805ba68d8c76b3dec3299f4d Mon Sep 17 00:00:00 2001 2From: Sofi <sofi+git@mailbox.org> 3Date: Sat, 29 Jul 2023 11:16:38 +0200 4Subject: [PATCH] make deterministic 5 6--- 7 pom.xml | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++------ 8 1 file changed, 57 insertions(+), 6 deletions(-) 9 10diff --git a/pom.xml b/pom.xml 11index 320d4f3..5a594e6 100644 12--- a/pom.xml 13+++ b/pom.xml 14@@ -51,6 +51,7 @@ 15 <maven.build.timestamp.format>yyyyMMdd.HHmmss</maven.build.timestamp.format> 16 <javafx.version>19.0.2.1</javafx.version> 17 <maven.compiler.release>11</maven.compiler.release> 18+ <project.build.outputTimestamp>2023-01-01T00:00:00Z</project.build.outputTimestamp> 19 </properties> 20 21 <issueManagement> 22@@ -166,7 +167,7 @@ 23 </dependency> 24 </dependencies> 25 <build> 26- <finalName>${project.artifactId}-${project.version}-${maven.build.timestamp}</finalName> 27+ <finalName>${project.artifactId}-${project.version}</finalName> 28 <resources> 29 <resource> 30 <directory>src/main/resources</directory> 31@@ -193,26 +194,51 @@ 32 <plugin> 33 <groupId>org.apache.maven.plugins</groupId> 34 <artifactId>maven-surefire-plugin</artifactId> 35- <version>2.22.2</version> 36+ <version>3.1.2</version> 37 </plugin> 38 <plugin> 39 <groupId>org.apache.maven.plugins</groupId> 40 <artifactId>maven-failsafe-plugin</artifactId> 41- <version>2.22.2</version> 42+ <version>3.1.2</version> 43 </plugin> 44 <plugin> 45 <groupId>org.apache.maven.plugins</groupId> 46 <artifactId>maven-compiler-plugin</artifactId> 47- <version>3.10.1</version> 48+ <version>3.11.0</version> 49 <configuration> 50 <release>11</release> 51 </configuration> 52 </plugin> 53+ <plugin> 54+ <groupId>org.apache.maven.plugins</groupId> 55+ <artifactId>maven-enforcer-plugin</artifactId> 56+ <version>3.3.0</version> 57+ <executions> 58+ <execution> 59+ <id>enforce-versions</id> 60+ <phase>validate</phase> 61+ <goals> 62+ <goal>enforce</goal> 63+ </goals> 64+ <configuration> 65+ <rules> 66+ <requireMavenVersion> 67+ <version>[3.2.5,)</version> 68+ </requireMavenVersion> 69+ <requireJavaVersion> 70+ <version>[1.8,)</version> 71+ </requireJavaVersion> 72+ <requirePluginVersions /> 73+ </rules> 74+ </configuration> 75+ </execution> 76+ </executions> 77+ </plugin> 78 <!-- Don't generate default JAR without dependencies --> 79 <plugin> 80 <groupId>org.apache.maven.plugins</groupId> 81 <artifactId>maven-jar-plugin</artifactId> 82- <version>3.1.2</version> 83+ <version>3.3.0</version> 84 <!-- 85 <configuration> 86 <manifestEntries> 87@@ -231,7 +257,7 @@ 88 <plugin> 89 <groupId>org.apache.maven.plugins</groupId> 90 <artifactId>maven-assembly-plugin</artifactId> 91- <version>3.1.0</version> 92+ <version>3.6.0</version> 93 <configuration> 94 <archive> 95 <manifest> 96@@ -253,6 +279,31 @@ 97 </execution> 98 </executions> 99 </plugin> 100+ <plugin> 101+ <groupId>org.apache.maven.plugins</groupId> 102+ <artifactId>maven-deploy-plugin</artifactId> 103+ <version>3.1.1</version> 104+ </plugin> 105+ <plugin> 106+ <groupId>org.apache.maven.plugins</groupId> 107+ <artifactId>maven-resources-plugin</artifactId> 108+ <version>3.3.1</version> 109+ </plugin> 110+ <plugin> 111+ <groupId>org.apache.maven.plugins</groupId> 112+ <artifactId>maven-site-plugin</artifactId> 113+ <version>4.0.0-M9</version> 114+ </plugin> 115+ <plugin> 116+ <groupId>org.apache.maven.plugins</groupId> 117+ <artifactId>maven-install-plugin</artifactId> 118+ <version>3.1.1</version> 119+ </plugin> 120+ <plugin> 121+ <groupId>org.apache.maven.plugins</groupId> 122+ <artifactId>maven-clean-plugin</artifactId> 123+ <version>3.3.1</version> 124+ </plugin> 125 </plugins> 126 </build> 127 </project> 128-- 1292.41.0 130