Merge pull request #324437 from wegank/maven-bump

maven: 3.9.6 -> 3.9.8
This commit is contained in:
Weijia Wang 2024-07-04 23:16:32 +02:00 committed by GitHub
commit c96b150a88
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 15 additions and 13 deletions

View File

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

View File

@ -56,7 +56,7 @@ in maven'.buildMavenPackage {
cp -r ${npmPkg} main/webapp/modules/core/3rdparty
'';
mvnParameters = "-pl !packaging";
mvnHash = "sha256-0qsKUMV9M0ZaddR5ust8VikSrsutdxVNNezKqR+F/6M=";
mvnHash = "sha256-FD4g0Mshz39N1h8MDAk907PhF5TguWTZ7AXKECHuhzQ=";
nativeBuildInputs = [ makeWrapper ];

View File

@ -49,7 +49,7 @@ maven.buildMavenPackage {
pname = "commafeed";
mvnHash = "sha256-YnEDJf4GeyiXxOh8tZZTZdLOJrisG6lmShXU97ueGNE=";
mvnHash = "sha256-LDZv3CBc/FpVMKmZ+kqfBdkTbqZcJMRqeXN35t4rwJI=";
mvnParameters = lib.escapeShellArgs [
"-Dskip.installnodenpm"

View File

@ -11,7 +11,7 @@ maven.buildMavenPackage rec {
hash = "sha256-F/tMRD+nWn/fRPX7cTan371zlOTxh7oR98wREmokULo=";
};
mvnHash = "sha256-b0nkp23gv4kejac/xrvm3xWo3Z8if7zveNUHBg7ZBm4=";
mvnHash = "sha256-6EX+y7/lGdB5LgW9MIER+KgvtPjvMCDjgq89f1g2GlY=";
mvnParameters = "compile assembly:single -Dmaven.test.skip=true";
nativeBuildInputs = [ makeWrapper ];
@ -20,7 +20,7 @@ maven.buildMavenPackage rec {
runHook preInstall
mkdir -p $out/{bin,lib}
cp /build/source/target/gol-tool-${version}-jar-with-dependencies.jar $out/lib/gol-tool.jar
cp target/gol-tool-${version}-jar-with-dependencies.jar $out/lib/gol-tool.jar
makeWrapper ${jre}/bin/java $out/bin/gol \
--add-flags "-cp $out/lib/gol-tool.jar" \

View File

@ -11,7 +11,7 @@ maven.buildMavenPackage rec {
hash = "sha256-3DTyo7rPswpEVzFkcprT6FD+ITGJ+qCXFKXEGoCK+oE=";
};
mvnHash = "sha256-m1o0m0foqJhEzWjC9behBeld5HT08WClcZN2xc3fZrI=";
mvnHash = "sha256-UHtvBVw35QBwgCD+nSduR0924ANAOfwrr/a4qPEYsrM=";
mvnParameters = "compile";
nativeBuildInputs = [ makeWrapper ];

View File

@ -9,11 +9,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "apache-maven";
version = "3.9.6";
version = "3.9.8";
src = fetchurl {
url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/apache-maven-${finalAttrs.version}-bin.tar.gz";
hash = "sha256-bu3SyuNibWrTpcnuMkvSZYU9ZCl/B/AzQwdVvQ4MOks=";
hash = "sha256-BnZyYpB1t0Dj0Kko4hAh3WFaUyh6821MzKROh+CB0QI=";
};
sourceRoot = ".";

View File

@ -28,7 +28,7 @@ mavenJdk8.buildMavenPackage rec {
sha256 = "sha256-z38I61JR4oiAkImkbwcvXoK5QsdoR986dDrOzhHsCeY=";
};
mvnHash = "sha256-Qbx1cNKFtSEnzhFImtCz2psYts2yhTDKzjmBBZavWwU=";
mvnHash = "sha256-es8M7gV2z1V9VpWOxanJwQyiemabiUw3n4heJB8Q75A=";
nativeBuildInputs = [ jdk8 makeWrapper ];

View File

@ -25,7 +25,7 @@ mavenJdk17.buildMavenPackage rec {
rev = version;
hash = "sha256-7T9n23qMl4IJQL7yWLXKvRzYcMeXDUwkY8MBFc2t3Rw=";
};
mvnHash = "sha256-bsJlsIXIIVzZyVgEF/SN+GgpZt6v0u800arO1c5QYHk=";
mvnHash = "sha256-FpfHtGIfo84z6v9/nzc47+JeIM43MR9mWhVOPSi0xhM=";
desktop = makeDesktopItem {
name = "RuneLite";

View File

@ -14,7 +14,7 @@ maven.buildMavenPackage rec {
};
mvnParameters = "-f h2/pom.xml";
mvnHash = "sha256-hUzE4F+RNCAfoY836pjrivf04xqN4m9SkiLXhmVzZRA=";
mvnHash = "sha256-kWRwaHb9+O07/jq8tgQnYpJa6zFsAMBCEnhT7HNKM4s=";
nativeBuildInputs = [ makeWrapper ];

View File

@ -13,7 +13,7 @@ mavenWithJdk.buildMavenPackage rec {
hash = "sha256-F+o94Oh9qxVdfgwdmyOv+WZl1BjQuzhQWaVrAgScgIU=";
};
mvnHash = "sha256-zqXbLnLmTZHzwH+vgGASR7Jsz1t173DmQMIe2R6B6Ic=";
mvnHash = "sha256-woOSkF5TuzaJ84EndryMoXTMbbK/V/BShM1k+WB8D/c=";
nativeBuildInputs = [ makeWrapper ];

View File

@ -11,7 +11,9 @@ maven.buildMavenPackage rec {
hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q=";
};
mvnHash = "sha256-yqMAEjaNHxm/c/cbApiMjkN7V6Gx/crs1LPbD0k0cgk=";
mvnHash = "sha256-lEcAq0H8Uacv02ItjVGfxvtRip5206HtpREBrQDzBDo=";
mvnParameters = "-DskipTests";
nativeBuildInputs = [ makeWrapper ];