From c04d7170e047829f03c514abb5a1aa98f58f7b80 Mon Sep 17 00:00:00 2001 From: Tomo Date: Wed, 30 Oct 2024 18:44:37 +0000 Subject: [PATCH] team-list: establish java team As discussed in #jdk:nixos.org on Matrix, the maintainers of the Java ecosystem in Nixpkgs feel that a team for Java would be helpful. --- ci/OWNERS | 6 ++++++ maintainers/team-list.nix | 13 +++++++++++++ pkgs/by-name/ap/apacheAnt/package.nix | 2 +- pkgs/by-name/gr/gradle-completion/package.nix | 2 +- pkgs/by-name/ma/maven/package.nix | 2 +- pkgs/development/compilers/openjdk/generic.nix | 11 +++++++---- .../compilers/temurin-bin/jdk-darwin-base.nix | 2 +- .../compilers/temurin-bin/jdk-linux-base.nix | 2 +- pkgs/development/compilers/zulu/common.nix | 2 +- .../tools/build-managers/gradle/default.nix | 2 +- 10 files changed, 33 insertions(+), 11 deletions(-) diff --git a/ci/OWNERS b/ci/OWNERS index 8e227b152566..e0deba1af776 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -206,6 +206,12 @@ pkgs/data/misc/cacert/ @ajs124 @lukegb @mweinelt pkgs/development/libraries/nss/ @ajs124 @lukegb @mweinelt pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt +# Java +/doc/languages-frameworks/java.section.md @NixOS/java +/doc/languages-frameworks/gradle.section.md @NixOS/java +/doc/languages-frameworks/maven.section.md @NixOS/java +/pkgs/top-level/java-packages.nix @NixOS/java + # Jetbrains /pkgs/applications/editors/jetbrains @edwtjo diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index b4f555105051..3deec6c11555 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -497,6 +497,19 @@ with lib.maintainers; shortName = "Input-Output Global employees"; }; + java = { + githubTeams = [ "java" ]; + members = [ + chayleaf + fliegendewurst + infinidoge + tomodachi94 + ]; + shortName = "Java"; + scope = "Maintainers of the Nixpkgs Java ecosystem (JDK, JVM, Java, Gradle, Maven, Ant, and adjacent projects)"; + enableFeatureFreezePing = true; + }; + jitsi = { members = [ cleeyv diff --git a/pkgs/by-name/ap/apacheAnt/package.nix b/pkgs/by-name/ap/apacheAnt/package.nix index 5e00d302ac4c..883163d00c42 100644 --- a/pkgs/by-name/ap/apacheAnt/package.nix +++ b/pkgs/by-name/ap/apacheAnt/package.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = [ ] ++ lib.teams.java.members; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/gr/gradle-completion/package.nix b/pkgs/by-name/gr/gradle-completion/package.nix index 6112c2edfa1d..f02977de87ef 100644 --- a/pkgs/by-name/gr/gradle-completion/package.nix +++ b/pkgs/by-name/gr/gradle-completion/package.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "Gradle tab completion for bash and zsh"; homepage = "https://github.com/gradle/gradle-completion"; license = licenses.mit; - maintainers = [ ]; + maintainers = [ ] ++ teams.java.members; }; } diff --git a/pkgs/by-name/ma/maven/package.nix b/pkgs/by-name/ma/maven/package.nix index d48e0448ea12..f7d88548f36b 100644 --- a/pkgs/by-name/ma/maven/package.nix +++ b/pkgs/by-name/ma/maven/package.nix @@ -54,7 +54,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; license = lib.licenses.asl20; mainProgram = "mvn"; - maintainers = [ ]; + maintainers = [ ] ++ lib.teams.java.members; inherit (jdk_headless.meta) platforms; }; }) diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix index 9ffa9becb93e..0d03be2a95cf 100644 --- a/pkgs/development/compilers/openjdk/generic.nix +++ b/pkgs/development/compilers/openjdk/generic.nix @@ -636,10 +636,13 @@ stdenv.mkDerivation (finalAttrs: { description = "Open-source Java Development Kit"; homepage = "https://openjdk.java.net/"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ - edwtjo - infinidoge - ]; + maintainers = + with lib.maintainers; + [ + edwtjo + infinidoge + ] + ++ lib.teams.java.members; mainProgram = "java"; platforms = [ diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix index 886c92ba2e38..836b282b0e49 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix @@ -69,7 +69,7 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; description = "${brand-name}, prebuilt OpenJDK binary"; platforms = builtins.map (arch: arch + "-darwin") providedCpuTypes; # some inherit jre.meta.platforms - maintainers = with maintainers; [ taku0 ]; + maintainers = with maintainers; [ taku0 ] ++ lib.teams.java.members; inherit knownVulnerabilities; mainProgram = "java"; }; diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix index 9d9033506aac..b166d3c0738b 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix @@ -127,7 +127,7 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; description = "${brand-name}, prebuilt OpenJDK binary"; platforms = builtins.map (arch: arch + "-linux") providedCpuTypes; # some inherit jre.meta.platforms - maintainers = with maintainers; [ taku0 ]; + maintainers = with maintainers; [ taku0 ] ++ lib.teams.java.members; inherit knownVulnerabilities; mainProgram = "java"; }; diff --git a/pkgs/development/compilers/zulu/common.nix b/pkgs/development/compilers/zulu/common.nix index f8127b2b7450..6b20c71c5438 100644 --- a/pkgs/development/compilers/zulu/common.nix +++ b/pkgs/development/compilers/zulu/common.nix @@ -164,7 +164,7 @@ let homepage = "https://www.azul.com/products/zulu/"; license = lib.licenses.gpl2Only; mainProgram = "java"; - maintainers = [ ]; + maintainers = [ ] ++ lib.teams.java.members; platforms = builtins.attrNames dists; sourceProvenance = with lib.sourceTypes; [ binaryBytecode binaryNativeCode ]; }; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index e1087a476c5c..5f34894e8dc3 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -174,7 +174,7 @@ rec { binaryNativeCode ]; license = licenses.asl20; - maintainers = with maintainers; [ lorenzleutgeb liff ]; + maintainers = with maintainers; [ lorenzleutgeb liff ] ++ lib.teams.java.members; mainProgram = "gradle"; } // meta; });