Skip to content

Commit e7092b4

Browse files
authored
Merge pull request github#16401 from igfoo/igfoo/vars
Java/Kotlin: Remove support for some deprecated environment variables
2 parents bcddef8 + 4d54c09 commit e7092b4

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,6 @@ public enum Var {
3636
/*
3737
* Core toolchain variables
3838
*/
39-
/**
40-
* The location of the toolchain.
41-
*
42-
* Deprecated in favour of {@link Var#SEMMLE_DIST}, {@link Var#SEMMLE_HOME}, and
43-
* {@link Var#SEMMLE_DATA}.
44-
*/
45-
@Deprecated
46-
ODASA_HOME,
4739
/**
4840
* The location of the user's configuration files, including project configurations,
4941
* dashboard configurations, team insight configurations, licenses etc.
@@ -82,10 +74,6 @@ public enum Var {
8274
* The location where our queries are kept.
8375
*/
8476
ODASA_QUERIES,
85-
/**
86-
* The location of the 'tools' directory
87-
*/
88-
ODASA_TOOLS,
8977
/**
9078
* Whether we are running in 'prototyping mode'.
9179
*/
@@ -197,10 +185,6 @@ public enum Var {
197185
* The platform we are running on; one of "linux", "osx" and "win".
198186
*/
199187
SEMMLE_PLATFORM,
200-
/**
201-
* Location of platform specific tools, currently only used in universal LGTM distributions
202-
*/
203-
SEMMLE_PLATFORM_TOOLS,
204188
/**
205189
* PATH to use to look up tooling required by macOS Relocator scripts.
206190
*/
@@ -284,7 +268,6 @@ public enum Var {
284268
/*
285269
* Layout variables
286270
*/
287-
ODASA_JAVA_LAYOUT,
288271
ODASA_CPP_LAYOUT,
289272
ODASA_CSHARP_LAYOUT,
290273
ODASA_PYTHON_LAYOUT,
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: breaking
3+
---
4+
* The Java extractor no longer supports the `ODASA_JAVA_LAYOUT`, `ODASA_TOOLS` and `ODASA_HOME` legacy environment variables.

0 commit comments

Comments
 (0)