Upgrade to latest releases of core dependencies (#242)

sbabcoc · Aug 9, 2022 · 7d9cbfa · 7d9cbfa
1 parent e7a12bb
commit 7d9cbfa
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -208,9 +208,9 @@ repositories {
 
 dependencies {
   constraints {
-    api 'com.nordstrom.tools:java-utils:3.0.0'
-    api 'com.nordstrom.tools:settings:3.0.1'
-    api 'com.nordstrom.tools:junit-foundation:17.0.1'
+    api 'com.nordstrom.tools:java-utils:3.1.1'
+    api 'com.nordstrom.tools:settings:3.0.2'
+    api 'com.nordstrom.tools:junit-foundation:17.0.2'
     api 'com.github.sbabcoc:logback-testng:2.0.0'
     api 'org.hamcrest:hamcrest-core:2.2'
     api 'org.yaml:snakeyaml:1.30'

diff --git a/pom.xml b/pom.xml
@@ -38,13 +38,13 @@
     <revision>@projectVersion@</revision>
     <timestamp>@projectTimestamp@</timestamp>
     <selenium-api>@seleniumApi@</selenium-api>
-    <java-utils.version>3.0.0</java-utils.version>
+    <java-utils.version>3.1.1</java-utils.version>
     <compiler-plugin.version>3.10.1</compiler-plugin.version>
     <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <source-plugin.version>3.2.1</source-plugin.version>
     <javadoc-plugin.version>3.4.0</javadoc-plugin.version>
-    <settings.version>3.0.1</settings.version>
-    <junit-foundation.version>17.0.1</junit-foundation.version>
+    <settings.version>3.0.2</settings.version>
+    <junit-foundation.version>17.0.2</junit-foundation.version>
     <logback-testng.version>2.0.0</logback-testng.version>
     <sonar.language>java</sonar.language>
     <jacoco.version>0.8.8</jacoco.version>
@@ -142,7 +142,7 @@
       </activation>
       <properties>
         <release.version>8</release.version>
-        <testng-foundation.version>4.0.1-j8</testng-foundation.version>
+        <testng-foundation.version>4.0.2-j8</testng-foundation.version>
         <selenium.version>3.141.59</selenium.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <guava.version>31.1-jre</guava.version>

diff --git a/selenium3Deps.gradle b/selenium3Deps.gradle
@@ -24,7 +24,7 @@ sourceSets {
 
 dependencies {
   constraints {
-    api 'com.nordstrom.tools:testng-foundation:4.0.1-j8'
+    api 'com.nordstrom.tools:testng-foundation:4.0.2-j8'
     api 'org.seleniumhq.selenium:selenium-server:3.141.59'
     api 'org.seleniumhq.selenium:selenium-support:3.141.59'
     api 'org.apache.httpcomponents:httpclient:4.5.13'

diff --git a/src/main/java/com/nordstrom/automation/selenium/core/LocalSeleniumGrid.java b/src/main/java/com/nordstrom/automation/selenium/core/LocalSeleniumGrid.java
@@ -28,6 +28,7 @@
 import com.nordstrom.automation.selenium.SeleniumConfig;
 import com.nordstrom.automation.selenium.exceptions.GridServerLaunchFailedException;
 import com.nordstrom.common.base.UncheckedThrow;
+import com.nordstrom.common.file.PathUtils;
 import com.nordstrom.common.jar.JarUtils;
 
 /**
@@ -294,6 +295,7 @@ public static LocalGridServer create(final String launcherClassName, final Strin
 
         String executable = System.getProperty("java.home") + File.separator + "bin" + File.separator + "java";
         CommandLine process = new CommandLine(executable, argsList.toArray(new String[0]));
+        process.setEnvironmentVariable("PATH", PathUtils.getSystemPath());
         return new LocalGridServer(hostUrl, portNum, role, process, workingPath, outputPath);
     }
 

diff --git a/src/main/java/com/nordstrom/automation/selenium/plugins/AbstractAppiumPlugin.java b/src/main/java/com/nordstrom/automation/selenium/plugins/AbstractAppiumPlugin.java
@@ -30,6 +30,7 @@
 import com.nordstrom.automation.selenium.core.SeleniumGrid.GridServer;
 import com.nordstrom.automation.selenium.exceptions.GridServerLaunchFailedException;
 import com.nordstrom.automation.selenium.utility.BinaryFinder;
+import com.nordstrom.common.file.PathUtils;
 
 import net.bytebuddy.implementation.Implementation;
 
@@ -326,6 +327,7 @@ private static File findMainScript() throws GridServerLaunchFailedException {
         argsList.add("-g");
 
         CommandLine process = new CommandLine(executable, argsList.toArray(new String[0]));
+        process.setEnvironmentVariable("PATH", PathUtils.getSystemPath());
 
         try {
             process.execute();
@@ -417,6 +419,7 @@ public static boolean shutdownAppiumWithPM2(URL nodeUrl) {
             }
 
             process = new CommandLine(executable, argsList.toArray(new String[0]));
+            process.setEnvironmentVariable("PATH", PathUtils.getSystemPath());
             process.execute();
             return true;
         }