Merge branch 'env-java-home' into 'main'

Set java home from environment variable for discover if -java_home not specified

See merge request weblogic-cloud/weblogic-deploy-tooling!1769

Author: robertpatrick

core/src/main/python/discover.py

@@ -274,6 +274,7 @@ def __process_java_home(optional_arg_map):
         java_home_name = optional_arg_map[CommandLineArgUtil.JAVA_HOME_SWITCH]
     else:
         java_home_name = env_helper.getenv('JAVA_HOME')
+        optional_arg_map[CommandLineArgUtil.JAVA_HOME_SWITCH] = java_home_name
 
     try:
         FileUtils.validateExistingDirectory(java_home_name)

integration-tests/system-test/src/test/java/oracle/weblogic/deploy/integration/ITWdt.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
 
@@ -1730,11 +1730,6 @@ private void verifyDiscoveredJDBCWalletModelFile(String expectedModelFile) throw
         checkContents.add("    Name: domain2");
         checkContents.add("    AdminServerName: admin-server");
         checkContents.add("    ProductionModeEnabled: true");
-        checkContents.add("    NMProperties:");
-
-        // Don't include the JavaHome path in the check since it will vary when running system-tests locally...
-        //
-        checkContents.add("        JavaHome: ");
         checkContents.add("    Server:");
         checkContents.add("        admin-server: {}");
         checkContents.add("    SecurityConfiguration:");