maven: 3.9.12 -> 3.9.16 (#497416)

This commit is contained in:
Arne Keller 2026-07-04 10:50:52 +00:00 committed by GitHub
commit 5a8120a3f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
39 changed files with 52 additions and 46 deletions

View file

@ -36,7 +36,7 @@ let
src = lib.sources.sourceFilesBySuffices ./. [ "pom.xml" ];
mvnHash = "sha256-4keHPzS8pbIIwODmBUMofJt27n5WqYh+IGqE6d9od7k=";
mvnHash = "sha256-6pezqcTIPR5NYFQUmLZ5Y3TOd+XRcB/eRmNSAEoBmls=";
installPhase = ''
mkdir -p $out/share/java

View file

@ -54,7 +54,7 @@ maven.buildMavenPackage {
pname = "commafeed";
mvnHash = "sha256-jAU1zaTftMuB1WgOeFzU1i+fFHAw6JYxTGw2mY8VlQw=";
mvnHash = "sha256-P3pmU/ou/gErk91ANjD4QuBTldBPKHYtGJREJQVgde8=";
mvnJdk = jdk25;
mvnParameters = lib.escapeShellArgs [

View file

@ -27,7 +27,7 @@ maven.buildMavenPackage rec {
mvnJdk = jdk;
mvnParameters = "-Dmaven.test.skip=true";
mvnHash = "sha256-54DT4C+WzyUBPxayA9YnB9I/Igd19iZygByUh5of51I=";
mvnHash = "sha256-oMfgWQ6mID1me0OP+BIwGJShCV5r/ahHlcAJ+S1KRBA=";
env = {
APP_VERSION = version;

View file

@ -84,7 +84,7 @@ maven.buildMavenPackage rec {
'';
mvnJdk = jre_headless;
mvnHash = "sha256-4N4KuJBF/RFZwpp3dIgXntxSEfKHyfvrShKQoUqY5bE=";
mvnHash = "sha256-eZuwBt+emThf4mxVaphFgBWNqP64Cs9WIKW+GPvHll4=";
manualMvnArtifacts = [
"com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1"
# added to saticfy protobuf compiler plugin dependency resolving

View file

@ -52,7 +52,7 @@ maven.buildMavenPackage rec {
};
inherit mvnParameters;
mvnHash = "sha256-wm/axWJucoW9P98dKqHI4bjrUnmBTfosCOdJg9VBJ+4=";
mvnHash = "sha256-qFJvpxK6PDmMfeL5fKVHUzK2NRLcQhQ3PJbwv2hYZqY=";
nativeBuildInputs = [
copyDesktopItems

View file

@ -17,7 +17,7 @@ maven.buildMavenPackage rec {
hash = "sha256-XrlZQf2BamYw8u1S2qQ6jV9mgyCEjBxKqPZCXMJzXmc=";
};
mvnHash = "sha256-/72Pi8WbKhPXu7Zb9r30znY1FHJc7FM42f7uQJqJnWo=";
mvnHash = "sha256-8q8voXYxOhWcb3U2Nqg/LRhSru94puhymQa7Z9FR0+g=";
mvnParameters = "package assembly:single -Dmaven.test.skip=true";

View file

@ -19,7 +19,7 @@ maven.buildMavenPackage rec {
hash = "sha256-sIcYjbWONg8Cq+dHpoBYj07cyHV7oX06Xh1zK0CHn64=";
};
mvnHash = "sha256-/gA49V1Kjh4zJTzDCzFNwZF30ERwPk2lG6lw/jxM2Qo=";
mvnHash = "sha256-41NirfgR9EhHLRT3V6P5KrakYKZ6dJTlXZu6rgCAK3I=";
mvnParameters = "-Plinux";
# tests want to create an X11 window which isn't often feasible

View file

@ -18,7 +18,7 @@ maven.buildMavenPackage (finalAttrs: {
patches = [ ./fix-maven-plugin-versions.patch ];
mvnHash = "sha256-EaOIAy0+YPrF+yGsFKKqcA4bt90bq1Z86V57P9rMatE=";
mvnHash = "sha256-KfIcc1MWGs7vZHPjfNgy3NBCAyTMtyvRTZfcN4LQVv8=";
buildOffline = true;
doCheck = false;

View file

@ -17,7 +17,7 @@ maven.buildMavenPackage rec {
hash = "sha256-AnPm5Mooww9kAMWLnM36z8DVRGfIIEiqUE65tgNuKm8=";
};
mvnHash = "sha256-YD28YX0RKuxOEWuK12ToOnFFrUPqA9xZ+EmsCt1fDPI=";
mvnHash = "sha256-kLSMLt0TMMuyWLU65Y+4CpEn5PIm/+nLg1+oBR5w3pI=";
mvnParameters = "compile assembly:single -Dmaven.test.skip=true";
nativeBuildInputs = [ makeWrapper ];

View file

@ -5,4 +5,4 @@ mapsBundle = "0.0.0-f171bcf55e447bf494348dd274cd377b73c951f6"
[hash]
src = "sha256-tK8zEX2szcU77ydHW+ak/GTjKKC6C5xlG0Uum7a/76I="
mapsBundle = "sha256-ehwWBIuYBwXu7W7uHYYuGl0lS4s6Tm5c4BfKPkY+w0A="
mvnDeps = "sha256-0B38C37QbkOhxd5e4SHfMg9SqcUZkuIf1g1S9SnCu7U="
mvnDeps = "sha256-bP019enDiHdKVtXvFXvBmsg9CtDTXA1t3VVjX3Xf8M0="

View file

@ -24,7 +24,7 @@ maven.buildMavenPackage (finalAttrs: {
};
mvnParameters = "-f h2/pom.xml";
mvnHash = "sha256-ue1X0fswi3C9uqJ/cVCf/qd2XStMve1k1qA+IsREOGk=";
mvnHash = "sha256-j4Uso/bl4UhQbJc7Wre0btgC+9RKvuCHkn9euQFuTxk=";
nativeBuildInputs = [ makeWrapper ];

View file

@ -32,7 +32,7 @@ maven.buildMavenPackage {
mvnFetchExtraArgs.dontConfigure = true;
mvnJdk = jdk_headless;
mvnHash = "sha256-2uthmSjFQ43N5lgV11DsxuGce+ZptZsmRLTgjDo0M2w=";
mvnHash = "sha256-xxTR+2E+4nIkGwxCk0B+f0//rLdlqO/nwRaArxt3u8U=";
nativeBuildInputs = [
jdk_headless

View file

@ -22,7 +22,7 @@ maven.buildMavenPackage {
hash = "sha256-pcHX6PdnD/jkLxAMSV/Ts8VVrK9xy2NWiMVVJ7jTrQc=";
};
mvnHash = "sha256-VpYSTN5u9IhCakak48HhbwnT3FhMpPKlwRZztiNGEIw=";
mvnHash = "sha256-L5Gru4b8lMiDWapzaK9VXoKqRkJnXc1uKUn5Vjmnrqc=";
nativeBuildInputs = [
makeWrapper

View file

@ -18,7 +18,7 @@ maven.buildMavenPackage rec {
hash = "sha256-3+vH1pGJ6I4oobb2vk+J5GrOQrSLNoCuBIC9OsWYCj0=";
};
mvnHash = "sha256-ZU/5RGujCdmlBuxtHDaBpF/54e8W/Kca+2jtTudMXWo=";
mvnHash = "sha256-y+K6FR0USh4LUyv/w5n3pRVILtMRKg64+3D7yfE1IP8=";
mvnParameters = "-Dmaven.gitcommitid.skip=true";

View file

@ -45,7 +45,7 @@ let
'';
outputHashMode = "recursive";
outputHash = "sha256-gOw0KUFyZEMONwLwlHSiV+ZZ7JQhjZwg708Q1IciUfo=";
outputHash = "sha256-Mtu67CcNY5uThfaa7CQr9cHHpjX+EMFktuSZOlLwyFg=";
doCheck = false;
};

View file

@ -17,7 +17,7 @@ maven.buildMavenPackage (finalAttrs: {
hash = "sha256-ZJFuY2QYB8eUS3y3VRMGGwklCS93HHVkNe/dhyIx0SY=";
};
mvnHash = "sha256-yQfiHlAZZgINGAYVlK5JflWX3d8Axtv1Ke89S7x86G4=";
mvnHash = "sha256-VXYY7XWRuSjju9mgQ6cvHlJwOK2BklE9j/uj0yczjcI=";
nativeBuildInputs = [ makeWrapper ];

View file

@ -17,7 +17,7 @@ maven.buildMavenPackage rec {
hash = "sha256-hr8a3Qr1LdFfGBLVJVkm6hhCW7knG4VpXj7nCtcptuU=";
};
mvnHash = "sha256-3y39873pxlQD7d02sbVtZ2I/zcQtPZ30XrA2qY84EzA=";
mvnHash = "sha256-XXqpajmHCjDxMZvYnW7EiCsPIuWF8tsE7RmI/gt3iZQ=";
mvnParameters = "-DskipTests -Dmaven.javadoc.skip=true";

View file

@ -18,16 +18,16 @@ maven.buildMavenPackage rec {
pname = "jsign";
# For build from non-release, increment version by one and add -SNAPSHOT
# e.g. 7.3-SNAPSHOT
version = "7.3";
version = "7.4";
src = fetchFromGitHub {
owner = "ebourg";
repo = "jsign";
tag = version;
hash = "sha256-FlVTKM1swdNP3kht8MELgUAHPv+FBpwt23WNl/moGjI=";
hash = "sha256-r19w9k6Iuk6AQGC3l2yu6Ocn740BtE7DjtFLXUdhdw8=";
};
mvnHash = "sha256-N91gwM3vsDZQM/BptF5RgRQ/A8g56NOJ6bc2SkxLnBs=";
mvnHash = "sha256-zxlwb2id8yAw/yxTjD6jyAkPJx9IazrPQYGacQGLEK8=";
nativeBuildInputs = [ makeBinaryWrapper ];

View file

@ -17,7 +17,7 @@ maven.buildMavenPackage (finalAttrs: {
hash = "sha256-3DTyo7rPswpEVzFkcprT6FD+ITGJ+qCXFKXEGoCK+oE=";
};
mvnHash = "sha256-UHtvBVw35QBwgCD+nSduR0924ANAOfwrr/a4qPEYsrM=";
mvnHash = "sha256-qGxpeb+8hP0ljbI0+aHnuO5efzXvVQWo8VFYMuRzYck=";
mvnParameters = "compile";
nativeBuildInputs = [ makeWrapper ];

View file

@ -48,7 +48,7 @@ maven.buildMavenPackage rec {
};
mvnJdk = jdk_headless;
mvnHash = "sha256-0KnaXr5Mmwm0pV4o5bAX0MWKl6f/cvlO6cyV9UcgXeo=";
mvnHash = "sha256-IJBmztfNco5UF0BwfeU5QHwvr50bXsrZFOSIPoGBijA=";
# Disable gitcommitid plugin which needs a .git folder which we don't have.
# Disable failing tests which either need internet access or are flaky.

View file

@ -16,7 +16,7 @@ maven.buildMavenPackage rec {
hash = "sha256-ScdrBSJKbVyD/omPrxiZvuaa5uOo2d3SqX/ozalMWHk=";
};
mvnHash = "sha256-pQYLMsxNVdby4WkO/dznIqqeu2dTtiBjrpJ/A3MuJ5Y=";
mvnHash = "sha256-CiUXHrabVX+ragocKbd4erIWr7J4kuWYcKYCDycpIrs=";
doCheck = false; # Requires networking

View file

@ -9,11 +9,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "maven";
version = "3.9.12";
version = "3.9.16";
src = fetchurl {
url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/apache-maven-${finalAttrs.version}-bin.tar.gz";
hash = "sha256-+iyZSHKSlsI6/Rj9AakPYs3aCaRhkbVKi8N2TC7ugS4=";
hash = "sha256-gP/KIq7Z6LlxOiMvM5T9gdfyAyLfde/bKwR9vT46I7s=";
};
sourceRoot = ".";

View file

@ -19,7 +19,7 @@ maven.buildMavenPackage {
hash = "sha256-6PKBzQA3lBa9/7J8bymGmnW3OPsRV4GgZ7dc7H6fOuE=";
};
mvnHash = "sha256-DVfPmW0ep6y/GxnwNKXxo68W5idcTkoNqUEKm7ouTEY=";
mvnHash = "sha256-JZ8INISDHPVhxylKwQc2DybPqxfwcGpkWxDhq8Fpqt8=";
nativeBuildInputs = [ makeWrapper ];

View file

@ -25,7 +25,7 @@ maven.buildMavenPackage {
hash = "sha256-WYBrLY04+bJGzjRMs8LgHnI6lMRhQKyz15DIoLeiE2s=";
};
mvnHash = "sha256-fu/q6CTvSllrfgnKNX6aIuPO65H/q0IPCHFuWmOFOvM=";
mvnHash = "sha256-MTI393L/t9AXYbE9hvkIQ28WzYmjt9B22XbFSlLQQUk=";
nativeBuildInputs = [ makeWrapper ];

View file

@ -32,7 +32,7 @@ maven.buildMavenPackage (finalAttrs: {
strictDeps = true;
__structuredAttrs = true;
mvnHash = "sha256-ekSgGKY3OMFAEM3bNByBXrU3tpbDcbJ0fmCTRz7NIkA=";
mvnHash = "sha256-JjhKHcnLO6OZ6VAI7fFpvS90TK6yOVhX0wk4vrnbFFo=";
nativeBuildInputs = [
makeWrapper

View file

@ -44,7 +44,7 @@ maven.buildMavenPackage rec {
hash = "sha256-A6Q6UoeyuOZP4FD4Y6oVOCu1a2bbIe+3xVHQIuOg0qk=";
};
mvnHash = "sha256-mZ/mOF9k5URheNNxmrKkCiklP26zeTGKhDGxqRiDBuk=";
mvnHash = "sha256-mPNyJ4zijwQg8l0G+2cJPkwAVRFVbpCRfyFkA5ONBIE=";
mvnFetchExtraArgs.preBuild = ''
mvn -nsu "${timestampParameter}" --projects org.nzbhydra:github-release-plugin "-Dmaven.repo.local=$out/.m2" clean install

View file

@ -26,7 +26,7 @@ maven.buildMavenPackage rec {
sed -i '/dirtyQualifier/d' ./pom.xml
'';
mvnHash = "sha256-oEAvqgH4/vfywPHUfbrIpOIdbeqt+K4H+Pebx5EQqMA=";
mvnHash = "sha256-2+6OU1CysNfGnESvAUbqK9RvRDlgIiWGuGC9sHza39c=";
# Disable test requires the network, we also set the version
mvnParameters = lib.escapeShellArgs [

View file

@ -52,7 +52,7 @@ let
})
];
mvnHash = "sha256-iWVWVEiwvCwc0ayVjH9joiDchyyNUOhEZjJTMH9CCEE=";
mvnHash = "sha256-oJnXNHAYZxWi9YDHw+RR1HWf7hlTKoZmnDIHxXNpp1M=";
mvnParameters = "-Duser.home=$TMPDIR";
doCheck = false;

View file

@ -22,7 +22,7 @@ maven.buildMavenPackage (finalAttrs: {
sourceRoot = "${finalAttrs.src.name}/java";
mvnHash = "sha256-LK673DYibhntPsHXvCM676ZzsE7tYIWPlQ2LFoCVvpc=";
mvnHash = "sha256-TWp/vlxqlK+8zqDzQySBKpLRUpLCG7Oa1C/1dIlwmsw=";
mvnParameters = "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z";
nativeBuildInputs = [

View file

@ -56,7 +56,7 @@ maven.buildMavenPackage {
mvnJdk = jdk;
mvnParameters = "-pl !packaging";
mvnHash = "sha256-SV5nfyUeyRul/YfZZXor8O37ARdCtKkrHCLzQrmr96s=";
mvnHash = "sha256-95lyc+pimtSM6v8S58bLG16/TotbHGa4EhHDzfxwPAk=";
nativeBuildInputs = [ makeWrapper ];

View file

@ -33,10 +33,16 @@ maven.buildMavenPackage rec {
mvnHash =
{
aarch64-linux = "sha256-Tlz2I6xE8g3GqKz9N7VXRO0ObE1XOv6IfTrKZmVlscY=";
x86_64-linux = "sha256-nQScNCkA+eaeL3tcLCec1qIoYO6ct28FLxGp/Cm4nn4=";
aarch64-linux = "sha256-o5dFk1pghCOaaxAto7e5kXn2mrVEGAtb9kTwQQN2N8o=";
x86_64-linux = "sha256-KYgeVBhqBjP6dqwpSzoqH8dfsL4WpJcSiHEMfgk0CNE=";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
mvnFetchExtraArgs.env = {
inherit (env) SOURCE_DATE_EPOCH;
};
# fix for "date 1980-01-01T00:00:00Z is not within the valid range 1980-01-01T00:00:02Z to 2099-12-31T23:59:59Z"
env.SOURCE_DATE_EPOCH = 315532802; # 1980-01-01T00:00:02Z
mvnParameters = "-DskipTests";

View file

@ -23,7 +23,7 @@ maven.buildMavenPackage rec {
};
mvnJdk = jdk17;
mvnHash = "sha256-FpfHtGIfo84z6v9/nzc47+JeIM43MR9mWhVOPSi0xhM=";
mvnHash = "sha256-OI+m2xJZPnyPXM/HlAsaBJ/z/NCcRSP7+PW5CQOsPiY=";
desktop = makeDesktopItem {
name = "RuneLite";

View file

@ -20,7 +20,7 @@ maven.buildMavenPackage rec {
};
mvnJdk = jdk;
mvnHash = "sha256-woOSkF5TuzaJ84EndryMoXTMbbK/V/BShM1k+WB8D/c=";
mvnHash = "sha256-PRgzlXEa5PWf2jwpLYKLMxY6RECKvdsGWBPKVNz/bnc=";
nativeBuildInputs = [ makeWrapper ];

View file

@ -18,7 +18,7 @@ maven.buildMavenPackage rec {
hash = "sha256-rUlGtMgTfhciQVif0KaUcuY28wh+PrHsKen8qODom24=";
};
mvnHash = "sha256-9qDzc6TRn9Yv3/nTATZgP6J+PTZEZCN1et/3GrRb7X4=";
mvnHash = "sha256-rqVKHMG/MKyo9P8DiMm87/Gc4YFgkkawagOjBUlrESU=";
nativeBuildInputs = [
makeWrapper

View file

@ -17,7 +17,7 @@ maven.buildMavenPackage rec {
hash = "sha256-lg8/diyGhfkUU0w7PEOlxb1WNpJZVDDllxMMsTIU/Cw=";
};
mvnHash = "sha256-CXJm9YlYsYViChFcH9e2P9pxK0q/tLWODOzZPXZ8hK0=";
mvnHash = "sha256-XMrAwOqQCt0vDUqFXodLhmujnrz2/FRSBYkAxDz9Z8c=";
mvnParameters = "compile assembly:single -Dmaven.test.skip=true";
nativeBuildInputs = [ makeWrapper ];

View file

@ -19,7 +19,7 @@ maven.buildMavenPackage rec {
hash = "sha256-pLUjSVePN++G2XZrdKEdobgBO+UD0PZ9wlhSUlZ7na8=";
};
mvnHash = "sha256-1XnVdud8nI2SuEPXnwEmbudM+QAeoSVTn0UZ8PKJH44=";
mvnHash = "sha256-J72B3qAVfRZ3lXpNyM1HYmBJQBkzj+J79fLIUJqyPTU=";
nativeBuildInputs = [
makeWrapper

View file

@ -60,9 +60,9 @@ let
];
# FIXME: Makes hash stable across platforms and convert to a single hash.
mvnHashByPlatform = {
"x86_64-linux" = "sha256-7UDFGuOMERvY74mkneusJyuAHfF3U6b4qV4MPHGQYdM=";
"aarch64-linux" = "sha256-7UDFGuOMERvY74mkneusJyuAHfF3U6b4qV4MPHGQYdM=";
"aarch64-darwin" = "sha256-lfO2YH+yKZWzh3MeQ7baESGmmW7zPdTLs8CjZ/FtLu0=";
"x86_64-linux" = "sha256-KYF7vSMXPgi6xvtgcSIIEOltK5RL4ynGQf1579Is5nM=";
"aarch64-linux" = "sha256-KYF7vSMXPgi6xvtgcSIIEOltK5RL4ynGQf1579Is5nM=";
"aarch64-darwin" = "sha256-uJXOACtuE4fKIb4a6C3Cy+MilI8OOdsuAgtJyklxHdw=";
};
wrapperArgs = [
"\${gappsWrapperArgs[@]}"

View file

@ -71,9 +71,9 @@ maven.buildMavenPackage rec {
mvnHash = # OpenJFX artifacts are platform dependent
if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) then
"sha256-gerjxTj8UQEVthMO3unWPEG7SPseMt5JPPureC/wUsw="
"sha256-GeSO6aFXeWLVOF9DVvFZ4FNv//NYhF68Nd6rxgeBO70="
else
"sha256-LoOiLisqc99gIGClpVe8tq5/2prmyyOzLDkpmuSgwVo=";
"sha256-j7SaDQKGMcXGdOKzv8zBFHpsqqFZzZzITW7I/ZXs+dI=";
installPhase = ''
runHook preInstall

View file

@ -14,7 +14,7 @@ maven.buildMavenPackage (finalAttrs: {
hash = "sha256-HMzRh/Q06Ik33mEkmh5U6qLiWk7ZCEstYq3Ll/pFhXM=";
};
mvnHash = "sha256-Ek2qulMSHd1ZJfEloo6fIe+QMqub/Ftna/TzTt01ky8=";
mvnHash = "sha256-UrvPqh5zxhTQ6MJNJ7CSAA6dg5DX+Jdx6/wKr4/1brs=";
installPhase = ''
runHook preInstall