Skip to content

Commit 19a8518

Browse files
ibbemibbem
authored
Merge pull request #161 from VariantSync/update-dependencies
Update dependencies
2 parents bac167d + afd65e1 commit 19a8518

File tree

3 files changed

+59
-26
lines changed

3 files changed

+59
-26
lines changed

‎default.nix‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
},
2727
doCheck ? true,
2828
buildGitHubPages ? true,
29-
dependenciesHash ? "sha256-LJQfV426han/+H9ejUla7JvN1LS/c9l3e7hODs4Z7Kg=",
29+
dependenciesHash ? "sha256-OdagSk6jYCkkw/kPoOJlma9yEK7hMBcNkuxE6qt0ra8=",
3030
}:
3131
pkgs.stdenvNoCC.mkDerivation rec {
3232
pname = "DiffDetective";
@@ -57,10 +57,22 @@ pkgs.stdenvNoCC.mkDerivation rec {
5757
# Maven needs to download necessary dependencies which is impure because it
5858
# requires network access. Hence, we download all dependencies as a
5959
# fixed-output derivation. This also serves as a nice cache.
60+
#
61+
# We use the hash of the input files to invalidate the maven cache whenever
62+
# the input files change. This is purely for easing maintenance. In case a
63+
# maintainer forgets (or simply doesn't know) to change the output hash to
64+
# force a rebuild (and obtain the new, correct hash) this usually (without
65+
# this naming hack) result in use of a stall cash, essentially behaving like
66+
# an unreproducable derivation where a second build results in a different
67+
# output. By changing the name of the fixed output derivation whenever
68+
# `mavenRepoSrc` changes, we prevent this stall cache as the resulting store
69+
# path will never exist (except when the cache is valid).
70+
mavenRepoSrc = pkgs.lib.sourceByRegex ./. ["^pom.xml$" "^local-maven-repo(/.*)?$"];
71+
mavenRepoSrcName = with pkgs.lib; last (splitString "/" mavenRepoSrc.outPath);
6072
mavenRepo = pkgs.stdenv.mkDerivation {
61-
pname = "${pname}-mavenRepo";
73+
pname = "${pname}-mavenRepo-${mavenRepoSrcName}";
6274
inherit version;
63-
src = pkgs.lib.sourceByRegex ./. ["^pom.xml$" "^local-maven-repo(/.*)?$"];
75+
src = mavenRepoSrc;
6476

6577
nativeBuildInputs = [pkgs.maven];
6678

‎nix/sources.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"nixpkgs": {
3-
"branch": "nixos-23.11",
3+
"branch": "nixos-25.05",
44
"description": "Nix Packages collection",
55
"homepage": null,
66
"owner": "NixOS",
77
"repo": "nixpkgs",
8-
"rev": "6832d0d99649db3d65a0e15fa51471537b2c56a6",
9-
"sha256": "1ww2vrgn8xrznssbd05hdlr3d4br6wbjlqprys1al8ahxkyl5syi",
8+
"rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922",
9+
"sha256": "16ag6ac2szq60bm17cdj5ybg46gkvffkmq6a34wpx38v28r25ghx",
1010
"type": "tarball",
11-
"url": "https://github.com/NixOS/nixpkgs/archive/6832d0d99649db3d65a0e15fa51471537b2c56a6.tar.gz",
11+
"url": "https://github.com/NixOS/nixpkgs/archive/10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922.tar.gz",
1212
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
1313
}
1414
}

‎pom.xml‎

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,31 @@
2020

2121
<build>
2222
<plugins>
23+
<plugin>
24+
<groupId>org.apache.maven.plugins</groupId>
25+
<artifactId>maven-enforcer-plugin</artifactId>
26+
<version>3.5.0</version>
27+
<executions>
28+
<execution>
29+
<id>enforce-maven</id>
30+
<goals>
31+
<goal>enforce</goal>
32+
</goals>
33+
<configuration>
34+
<rules>
35+
<requireMavenVersion>
36+
<version>3.6.3</version>
37+
</requireMavenVersion>
38+
</rules>
39+
</configuration>
40+
</execution>
41+
</executions>
42+
</plugin>
43+
2344
<plugin>
2445
<groupId>org.apache.maven.plugins</groupId>
2546
<artifactId>maven-javadoc-plugin</artifactId>
26-
<version>3.4.1</version>
47+
<version>3.11.2</version>
2748
<configuration>
2849
<reportOutputDirectory>docs</reportOutputDirectory>
2950
<destDir>javadoc</destDir>
@@ -34,13 +55,13 @@
3455
<plugin>
3556
<groupId>org.apache.maven.plugins</groupId>
3657
<artifactId>maven-compiler-plugin</artifactId>
37-
<version>3.10.1</version>
58+
<version>3.14.0</version>
3859
</plugin>
3960

4061
<plugin>
4162
<groupId>org.apache.maven.plugins</groupId>
4263
<artifactId>maven-surefire-plugin</artifactId>
43-
<version>3.0.0-M8</version>
64+
<version>3.5.3</version>
4465
<configuration>
4566
<includes>
4667
<include>**/*.java</include>
@@ -52,7 +73,7 @@
5273
<plugin>
5374
<groupId>org.apache.maven.plugins</groupId>
5475
<artifactId>maven-assembly-plugin</artifactId>
55-
<version>3.4.2</version>
76+
<version>3.7.1</version>
5677
<executions>
5778
<execution>
5879
<phase>package</phase>
@@ -71,7 +92,7 @@
7192
<plugin>
7293
<groupId>org.antlr</groupId>
7394
<artifactId>antlr4-maven-plugin</artifactId>
74-
<version>4.13.1</version>
95+
<version>4.13.2</version>
7596
<executions>
7697
<execution>
7798
<goals>
@@ -125,7 +146,7 @@
125146
<!-- For Gumtree -->
126147
<groupId>org.atteo.classindex</groupId>
127148
<artifactId>classindex</artifactId>
128-
<version>3.11</version>
149+
<version>3.13</version>
129150
<scope>test</scope>
130151
</dependency>
131152

@@ -138,81 +159,81 @@
138159
<dependency>
139160
<groupId>org.eclipse.jgit</groupId>
140161
<artifactId>org.eclipse.jgit</artifactId>
141-
<version>6.7.0.202309050840-r</version>
162+
<version>7.2.1.202505142326-r</version>
142163
</dependency>
143164

144165
<dependency>
145166
<groupId>org.apache.commons</groupId>
146167
<artifactId>commons-lang3</artifactId>
147-
<version>3.12.0</version>
168+
<version>3.17.0</version>
148169
</dependency>
149170

150171
<dependency>
151172
<groupId>commons-io</groupId>
152173
<artifactId>commons-io</artifactId>
153-
<version>2.14.0</version>
174+
<version>2.19.0</version>
154175
</dependency>
155176

156177
<dependency>
157178
<groupId>org.tinylog</groupId>
158179
<artifactId>tinylog-api</artifactId>
159-
<version>2.6.1</version>
180+
<version>2.7.0</version>
160181
</dependency>
161182
<dependency>
162183
<groupId>org.tinylog</groupId>
163184
<artifactId>tinylog-impl</artifactId>
164-
<version>2.6.1</version>
185+
<version>2.7.0</version>
165186
</dependency>
166187

167188
<dependency>
168189
<groupId>org.apache.maven.plugins</groupId>
169190
<artifactId>maven-compiler-plugin</artifactId>
170-
<version>3.11.0</version>
191+
<version>3.14.0</version>
171192
</dependency>
172193

173194
<dependency>
174195
<groupId>org.junit.jupiter</groupId>
175196
<artifactId>junit-jupiter-engine</artifactId>
176-
<version>5.9.2</version>
197+
<version>5.13.0</version>
177198
<scope>test</scope>
178199
</dependency>
179200
<dependency>
180201
<groupId>org.junit.jupiter</groupId>
181202
<artifactId>junit-jupiter</artifactId>
182-
<version>5.9.2</version>
203+
<version>5.13.0</version>
183204
<scope>test</scope>
184205
</dependency>
185206
<dependency>
186207
<groupId>org.junit.platform</groupId>
187208
<artifactId>junit-platform-launcher</artifactId>
188-
<version>1.9.2</version>
209+
<version>1.13.0</version>
189210
<scope>test</scope>
190211
</dependency>
191212
<dependency>
192213
<groupId>org.apache.maven.surefire</groupId>
193214
<artifactId>surefire-junit-platform</artifactId>
194-
<version>3.0.0-M8</version>
215+
<version>3.5.3</version>
195216
<scope>test</scope>
196217
</dependency>
197218

198219
<!-- SLF4J API -->
199220
<dependency>
200221
<groupId>org.slf4j</groupId>
201222
<artifactId>slf4j-api</artifactId>
202-
<version>2.0.5</version>
223+
<version>2.0.17</version>
203224
</dependency>
204225

205226
<!-- SLF4J Simple binding -->
206227
<dependency>
207228
<groupId>org.slf4j</groupId>
208229
<artifactId>slf4j-simple</artifactId>
209-
<version>2.0.5</version>
230+
<version>2.0.17</version>
210231
</dependency>
211232

212233
<dependency>
213234
<groupId>org.antlr</groupId>
214235
<artifactId>antlr4</artifactId>
215-
<version>4.13.1</version>
236+
<version>4.13.2</version>
216237
</dependency>
217238
</dependencies>
218239
</project>

0 commit comments

Comments
 (0)