diff --git a/src/feature-flags.ts b/src/feature-flags.ts index 4025c0cca..0b56e284d 100644 --- a/src/feature-flags.ts +++ b/src/feature-flags.ts @@ -44,7 +44,6 @@ export interface FeatureEnablement { * Each value of this enum should end with `_enabled`. */ export enum Feature { - CodeqlJavaLombokEnabled = "codeql_java_lombok_enabled", CppDependencyInstallation = "cpp_dependency_installation_enabled", DisableKotlinAnalysisEnabled = "disable_kotlin_analysis_enabled", DisablePythonDependencyInstallationEnabled = "disable_python_dependency_installation_enabled", @@ -58,11 +57,6 @@ export const featureConfig: Record< Feature, { envVar: string; minimumVersion: string | undefined; defaultValue: boolean } > = { - [Feature.CodeqlJavaLombokEnabled]: { - envVar: "CODEQL_JAVA_LOMBOK", - minimumVersion: "2.14.0", - defaultValue: false, - }, [Feature.CppDependencyInstallation]: { envVar: "CODEQL_EXTRACTOR_CPP_AUTOINSTALL_DEPENDENCIES", minimumVersion: "2.15.0", diff --git a/src/init-action.ts b/src/init-action.ts index 708e323b2..5e03230b0 100644 --- a/src/init-action.ts +++ b/src/init-action.ts @@ -425,20 +425,19 @@ async function run() { core.exportVariable(kotlinLimitVar, "1.9.20"); } - if (config.languages.includes(Language.java)) { + if ( + config.languages.includes(Language.java) && + (await codeQlVersionAbove(codeql, "2.14.0")) && + !(await codeQlVersionAbove(codeql, "2.14.4")) + ) { const envVar = "CODEQL_EXTRACTOR_JAVA_RUN_ANNOTATION_PROCESSORS"; if (process.env[envVar]) { logger.info( `Environment variable ${envVar} already set. Not en/disabling CodeQL Java Lombok support`, ); - } else if ( - await features.getValue(Feature.CodeqlJavaLombokEnabled, codeql) - ) { + } else { logger.info("Enabling CodeQL Java Lombok support"); core.exportVariable(envVar, "true"); - } else { - logger.info("Disabling CodeQL Java Lombok support"); - core.exportVariable(envVar, "false"); } }