hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-18 09:43:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17071 from igfoo/igfoo/dep_env

Browse Source 
Java/Kotlin: Remove support for deprecated SOURCE_ARCHIVE and TRAP_FOLDER
This commit is contained in:
Ian Lynagh
2024-07-29 14:55:50 +01:00
committed by GitHub
parent 58689c90fb 225d2915e5
commit 1530037eae
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/kotlin-extractor/src/main/java/com/semmle/extractor/java/OdasaOutput.java
View File

@@ -78,13 +78,11 @@ public class OdasaOutput {
} }
public OdasaOutput(boolean trackClassOrigins, Compression compression, Logger log) { public OdasaOutput(boolean trackClassOrigins, Compression compression, Logger log) {
String trapFolderVar = Env.systemEnv().getFirstNonEmpty("CODEQL_EXTRACTOR_JAVA_TRAP_DIR", String trapFolderVar = Env.systemEnv().get("CODEQL_EXTRACTOR_JAVA_TRAP_DIR");
Var.TRAP_FOLDER.name());
if (trapFolderVar == null) { if (trapFolderVar == null) {
throw new ResourceError("CODEQL_EXTRACTOR_JAVA_TRAP_DIR was not set"); throw new ResourceError("CODEQL_EXTRACTOR_JAVA_TRAP_DIR was not set");
} }
String sourceArchiveVar = Env.systemEnv().getFirstNonEmpty("CODEQL_EXTRACTOR_JAVA_SOURCE_ARCHIVE_DIR", String sourceArchiveVar = Env.systemEnv().get("CODEQL_EXTRACTOR_JAVA_SOURCE_ARCHIVE_DIR");
Var.SOURCE_ARCHIVE.name());
if (sourceArchiveVar == null) { if (sourceArchiveVar == null) {
throw new ResourceError("CODEQL_EXTRACTOR_JAVA_SOURCE_ARCHIVE_DIR was not set"); throw new ResourceError("CODEQL_EXTRACTOR_JAVA_SOURCE_ARCHIVE_DIR was not set");
} }

2
java/kotlin-extractor/src/main/java/com/semmle/util/process/Env.java
View File

@@ -256,8 +256,6 @@ public class Env {
*/ */
ODASA_SRC, ODASA_SRC,
ODASA_DB, ODASA_DB,
TRAP_FOLDER,
SOURCE_ARCHIVE,
ODASA_OUTPUT, ODASA_OUTPUT,
ODASA_SUBPROJECT_THREADS, ODASA_SUBPROJECT_THREADS,

4
java/ql/lib/change-notes/2024-07-25-env-vars.md Normal file
View File

@@ -0,0 +1,4 @@
---
category: breaking
---
* The Java and Kotlin extractors no longer support the `SOURCE_ARCHIVE` and `TRAP_FOLDER` legacy environment variable.