diff --git a/habushu-maven-plugin/src/main/java/org/technologybrewery/habushu/PyenvAndPoetrySetup.java b/habushu-maven-plugin/src/main/java/org/technologybrewery/habushu/PyenvAndPoetrySetup.java index bc85f4cb..fa9bb86e 100644 --- a/habushu-maven-plugin/src/main/java/org/technologybrewery/habushu/PyenvAndPoetrySetup.java +++ b/habushu-maven-plugin/src/main/java/org/technologybrewery/habushu/PyenvAndPoetrySetup.java @@ -34,7 +34,6 @@ public class PyenvAndPoetrySetup { */ final String pythonDefaultVersionRequirement; - private final ThreadLocal validationStatusContainer; public final String validatedInPriorBuildPhase; /** @@ -80,7 +79,6 @@ public class PyenvAndPoetrySetup { * * @param pythonDefaultVersionRequirement Specifies the semver compliant requirement for the default version of Python that * must be installed and available for Habushu to use. - * @param validationStatusContainer container for validation status tracking * @param validatedInPriorBuildPhase string value indicating validation in prior build phase * @param pythonVersion version of python to leverage * @param usePyenv whether we are using pyenv to instance and activate python versions @@ -89,11 +87,9 @@ public class PyenvAndPoetrySetup { * @param log the logger to use for output */ public PyenvAndPoetrySetup(String pythonDefaultVersionRequirement, - ThreadLocal validationStatusContainer, String validatedInPriorBuildPhase, String pythonVersion, boolean usePyenv, File baseDir, boolean rewriteLocalPathDepsInArchives, Log log) { this.pythonDefaultVersionRequirement = pythonDefaultVersionRequirement; - this.validationStatusContainer = validationStatusContainer; this.validatedInPriorBuildPhase = validatedInPriorBuildPhase; this.pythonVersion = pythonVersion; this.usePyenv = usePyenv; @@ -102,18 +98,6 @@ public PyenvAndPoetrySetup(String pythonDefaultVersionRequirement, this.log = log; } - public String getPythonDefaultVersionRequirement() { - return pythonDefaultVersionRequirement; - } - - public ThreadLocal getValidationStatusContainer() { - return validationStatusContainer; - } - - public String getValidatedInPriorBuildPhase() { - return validatedInPriorBuildPhase; - } - public String configurePyenvOrStraightPython(boolean usePyenv, List missingRequiredToolMsgs, File patchInstallScript) throws MojoExecutionException { String currentPythonVersion = ""; if (usePyenv) { diff --git a/habushu-maven-plugin/src/main/java/org/technologybrewery/habushu/PythonPackageAndDependencyManagerSetup.java b/habushu-maven-plugin/src/main/java/org/technologybrewery/habushu/PythonPackageAndDependencyManagerSetup.java index f6bcd0b4..1ec71e49 100644 --- a/habushu-maven-plugin/src/main/java/org/technologybrewery/habushu/PythonPackageAndDependencyManagerSetup.java +++ b/habushu-maven-plugin/src/main/java/org/technologybrewery/habushu/PythonPackageAndDependencyManagerSetup.java @@ -122,7 +122,7 @@ public PythonPackageAndDependencyManagerSetup(String pythonVersion, String pytho this.rewriteLocalPathDepsInArchives = rewriteLocalPathDepsInArchives; this.log = log; this.poetryConfigureTools = new PyenvAndPoetrySetup(PYTHON_DEFAULT_VERSION_REQUIREMENT, - validationStatusContainer, VALIDATED_IN_PRIOR_BUILD_PHASE, pythonVersion, usePyenv, + VALIDATED_IN_PRIOR_BUILD_PHASE, pythonVersion, usePyenv, baseDir, rewriteLocalPathDepsInArchives, log); }