From e4b9335ce086b579d266639f52df975b05a3b91f Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Thu, 25 Jul 2024 12:46:13 +0100 Subject: [PATCH 1/2] Kotlin: Remove support for deprecated SOURCE_ARCHIVE and TRAP_FOLDER --- .../main/java/com/semmle/extractor/java/OdasaOutput.java | 6 ++---- .../src/main/java/com/semmle/util/process/Env.java | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/java/kotlin-extractor/src/main/java/com/semmle/extractor/java/OdasaOutput.java b/java/kotlin-extractor/src/main/java/com/semmle/extractor/java/OdasaOutput.java index 435dc85513e..ef7df5d4053 100644 --- a/java/kotlin-extractor/src/main/java/com/semmle/extractor/java/OdasaOutput.java +++ b/java/kotlin-extractor/src/main/java/com/semmle/extractor/java/OdasaOutput.java @@ -78,13 +78,11 @@ public class OdasaOutput { } public OdasaOutput(boolean trackClassOrigins, Compression compression, Logger log) { - String trapFolderVar = Env.systemEnv().getFirstNonEmpty("CODEQL_EXTRACTOR_JAVA_TRAP_DIR", - Var.TRAP_FOLDER.name()); + String trapFolderVar = Env.systemEnv().get("CODEQL_EXTRACTOR_JAVA_TRAP_DIR"); if (trapFolderVar == null) { throw new ResourceError("CODEQL_EXTRACTOR_JAVA_TRAP_DIR was not set"); } - String sourceArchiveVar = Env.systemEnv().getFirstNonEmpty("CODEQL_EXTRACTOR_JAVA_SOURCE_ARCHIVE_DIR", - Var.SOURCE_ARCHIVE.name()); + String sourceArchiveVar = Env.systemEnv().get("CODEQL_EXTRACTOR_JAVA_SOURCE_ARCHIVE_DIR"); if (sourceArchiveVar == null) { throw new ResourceError("CODEQL_EXTRACTOR_JAVA_SOURCE_ARCHIVE_DIR was not set"); } diff --git a/java/kotlin-extractor/src/main/java/com/semmle/util/process/Env.java b/java/kotlin-extractor/src/main/java/com/semmle/util/process/Env.java index 2edfbb3e164..564887f5fda 100644 --- a/java/kotlin-extractor/src/main/java/com/semmle/util/process/Env.java +++ b/java/kotlin-extractor/src/main/java/com/semmle/util/process/Env.java @@ -256,8 +256,6 @@ public class Env { */ ODASA_SRC, ODASA_DB, - TRAP_FOLDER, - SOURCE_ARCHIVE, ODASA_OUTPUT, ODASA_SUBPROJECT_THREADS, From 225d2915e5c95b794a5ee28adc1aa77d0d6916f6 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Thu, 25 Jul 2024 12:48:55 +0100 Subject: [PATCH 2/2] Java/Kotlin: Add changenote for dropping SOURCE_ARCHIVE/TRAP_FOLDER --- java/ql/lib/change-notes/2024-07-25-env-vars.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 java/ql/lib/change-notes/2024-07-25-env-vars.md diff --git a/java/ql/lib/change-notes/2024-07-25-env-vars.md b/java/ql/lib/change-notes/2024-07-25-env-vars.md new file mode 100644 index 00000000000..8c58be3b412 --- /dev/null +++ b/java/ql/lib/change-notes/2024-07-25-env-vars.md @@ -0,0 +1,4 @@ +--- +category: breaking +--- +* The Java and Kotlin extractors no longer support the `SOURCE_ARCHIVE` and `TRAP_FOLDER` legacy environment variable.