Merge pull request #16401 from igfoo/igfoo/vars

Java/Kotlin: Remove support for some deprecated environment variables

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

@@ -36,14 +36,6 @@ public class Env {
 		/*
 		 * Core toolchain variables
 		 */
-		/**
-		 * The location of the toolchain.
-		 *
-		 * Deprecated in favour of {@link Var#SEMMLE_DIST}, {@link Var#SEMMLE_HOME}, and
-		 * {@link Var#SEMMLE_DATA}.
-		 */
-		@Deprecated
-		ODASA_HOME,
 		/**
 		 * The location of the user's configuration files, including project configurations,
 		 * dashboard configurations, team insight configurations, licenses etc.
@@ -82,10 +74,6 @@ public class Env {
 		 * The location where our queries are kept.
 		 */
 		ODASA_QUERIES,
-		/**
-		 * The location of the 'tools' directory
-		 */
-		ODASA_TOOLS,
 		/**
 		 * Whether we are running in 'prototyping mode'.
 		 */
@@ -197,10 +185,6 @@ public class Env {
 		 * The platform we are running on; one of "linux", "osx" and "win".
 		 */
 		SEMMLE_PLATFORM,
-		/**
-		 * Location of platform specific tools, currently only used in universal LGTM distributions
-		 */
-		SEMMLE_PLATFORM_TOOLS,
 		/**
 		 * PATH to use to look up tooling required by macOS Relocator scripts.
 		 */
@@ -284,7 +268,6 @@ public class Env {
 		/*
 		 * Layout variables
 		 */
-		ODASA_JAVA_LAYOUT,
 		ODASA_CPP_LAYOUT,
 		ODASA_CSHARP_LAYOUT,
 		ODASA_PYTHON_LAYOUT,

java/ql/lib/change-notes/2024-05-02-env-vars.md

@@ -0,0 +1,4 @@
+---
+category: breaking
+---
+* The Java extractor no longer supports the `ODASA_JAVA_LAYOUT`, `ODASA_TOOLS` and `ODASA_HOME` legacy environment variables.