Emmanuel Bourg pushed to branch master at Debian Java Maintainers / surefire
Commits: c4ec6904 by Emmanuel Bourg at 2026-10-28T09:38:39+01:00 Fixed the excludedEnvironmentVariables parameter of maven-surefire-plugin - - - - - 3 changed files: - debian/changelog - + debian/patches/maven-shared-utils-compatibility.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +surefire (3.5.6-2) unstable; urgency=medium + + * Team upload. + * Fixed the excludedEnvironmentVariables parameter of maven-surefire-plugin + + -- Emmanuel Bourg <[email protected]> Wed, 28 Oct 2026 09:34:07 +0100 + surefire (3.5.6-1) unstable; urgency=medium * Team upload. ===================================== debian/patches/maven-shared-utils-compatibility.patch ===================================== @@ -0,0 +1,36 @@ +Description: Honour excludedEnvironmentVariables with maven-shared-utils 3.4, where + Commandline.getEnvironmentVariables() no longer calls addSystemEnvironment(). + Fixed upstream in surefire 3.6.0. +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/Commandline.java ++++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/Commandline.java +@@ -18,6 +18,7 @@ + */ + package org.apache.maven.plugin.surefire.booterclient.lazytestprovider; + ++import java.util.Arrays; + import java.util.Collection; + import java.util.HashSet; + import java.util.Properties; +@@ -57,6 +58,20 @@ + } + + @Override ++ public String[] getEnvironmentVariables() { ++ String[] envs = super.getEnvironmentVariables(); ++ return excludedEnvironmentVariables.isEmpty() ++ ? envs ++ : Arrays.stream(envs) ++ .filter(env -> { ++ String varName = ++ env != null && env.contains("=") ? env.substring(0, env.indexOf('=')) : env; ++ return !excludedEnvironmentVariables.contains(varName); ++ }) ++ .toArray(String[]::new); ++ } ++ ++ @Override + public final void addSystemEnvironment() { + Properties systemEnvVars = CommandLineUtils.getSystemEnvVars(); + ===================================== debian/patches/series ===================================== @@ -4,3 +4,4 @@ dependency-plugin-configuration.patch jsr305-dependency.patch shared-utils-optional-shaded-dependencies.patch disable-doclint.patch +maven-shared-utils-compatibility.patch View it on GitLab: https://salsa.debian.org/java-team/surefire/-/commit/c4ec6904b72bcc1d0190332b8ca336baa323f2ff -- View it on GitLab: https://salsa.debian.org/java-team/surefire/-/commit/c4ec6904b72bcc1d0190332b8ca336baa323f2ff You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
