Upgrade dependencies and plugins (#170)

sbabcoc · Aug 27, 2021 · d4d4dfe · d4d4dfe
1 parent 41fc42a
commit d4d4dfe
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 52 deletions.
diff --git a/build.gradle b/build.gradle
@@ -286,16 +286,15 @@ repositories {
 }
 
 dependencies {
-  compile 'com.nordstrom.tools:java-utils:2.0.0'
-  compile 'com.nordstrom.tools:settings:2.3.5'
-  compile 'com.nordstrom.tools:junit-foundation:15.3.0'
-  compile('com.github.sbabcoc:logback-testng:1.3.2') {
+  compile 'com.nordstrom.tools:java-utils:2.0.3'
+  compile 'com.nordstrom.tools:settings:2.3.9'
+  compile 'com.nordstrom.tools:junit-foundation:15.3.2'
+  compile('com.github.sbabcoc:logback-testng:1.3.4') {
     exclude group: 'org.testng', module: 'testng'
   }
-  compile 'org.jsoup:jsoup:1.12.1'
+  compile 'org.jsoup:jsoup:1.13.1'
   compile('org.hamcrest:hamcrest-core:2.2') { force = true }
   compile('org.yaml:snakeyaml:1.28') { force = true }
-  compile('org.eclipse.jetty.websocket:websocket-client:9.4.43.v20210629') { force = true }
 
   apply from: "${profile}Deps.gradle"
 

diff --git a/pom.xml b/pom.xml
@@ -38,25 +38,23 @@
     <revision>@projectVersion@</revision>
     <timestamp>@projectTimestamp@</timestamp>
     <selenium-api>@seleniumApi@</selenium-api>
-    <java-utils.version>2.0.0</java-utils.version>
+    <java-utils.version>2.0.3</java-utils.version>
     <compiler-plugin.version>3.8.1</compiler-plugin.version>
-    <surefire-plugin.version>2.22.2</surefire-plugin.version>
-    <source-plugin.version>3.2.0</source-plugin.version>
-    <javadoc-plugin.version>3.1.1</javadoc-plugin.version>
-    <settings.version>2.3.5</settings.version>
-    <junit-foundation.version>15.3.0</junit-foundation.version>
-    <logback-testng.version>1.3.2</logback-testng.version>
+    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <source-plugin.version>3.2.1</source-plugin.version>
+    <javadoc-plugin.version>3.3.0</javadoc-plugin.version>
+    <settings.version>2.3.9</settings.version>
+    <junit-foundation.version>15.3.2</junit-foundation.version>
+    <logback-testng.version>1.3.4</logback-testng.version>
     <sonar.language>java</sonar.language>
-    <jacoco.version>0.8.5</jacoco.version>
-    <jsoup.version>1.12.1</jsoup.version>
-    <build-helper-plugin.version>3.0.0</build-helper-plugin.version>
-    <dependency-plugin.version>3.1.1</dependency-plugin.version>
+    <jacoco.version>0.8.7</jacoco.version>
+    <jsoup.version>1.13.1</jsoup.version>
+    <build-helper-plugin.version>3.2.0</build-helper-plugin.version>
+    <dependency-plugin.version>3.2.0</dependency-plugin.version>
     <clean-plugin.version>3.1.0</clean-plugin.version>
     <hamcrest.version>2.2</hamcrest.version>
     <!-- managed to resolve identified threat -->
     <snakeyaml.version>1.28</snakeyaml.version>
-    <!-- managed to resolve identified threat -->
-    <websocket-client.version>9.4.43.v20210629</websocket-client.version>
   </properties>
 
   <scm>
@@ -150,15 +148,15 @@
       </activation>
       <properties>
         <release.version>7</release.version>
-        <testng-foundation.version>3.0.1-j7</testng-foundation.version>
+        <testng-foundation.version>3.0.3-j7</testng-foundation.version>
         <selenium.version>2.53.1</selenium.version>
-        <guava-agent.version>30.1</guava-agent.version>
-        <guava.version>30.1.1-android</guava.version>
-        <commons-io.version>2.4</commons-io.version>
+        <commons-io.version>2.6</commons-io.version>
         <htmlunit.version>2.21</htmlunit.version>
         <mockito.version>2.25.0</mockito.version>
         <!-- managed to resolve identified threat -->
-        <bouncycastle.version>1.68</bouncycastle.version>
+        <websocket-client.version>9.2.30.v20200428</websocket-client.version>
+        <!-- managed to resolve identified threat -->
+        <bouncycastle.version>1.69</bouncycastle.version>
         <!-- managed to resolve identified threat -->
         <httpcomponents.version>4.5.13</httpcomponents.version>
       </properties>
@@ -169,16 +167,6 @@
             <artifactId>testng-foundation</artifactId>
             <version>${testng-foundation.version}</version>
           </dependency>
-          <dependency>
-            <groupId>com.nordstrom.tools</groupId>
-            <artifactId>guava-agent</artifactId>
-            <version>${guava-agent.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-          </dependency>          
           <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -236,10 +224,6 @@
           <groupId>com.nordstrom.tools</groupId>
           <artifactId>testng-foundation</artifactId>
         </dependency>
-        <dependency>
-          <groupId>com.nordstrom.tools</groupId>
-          <artifactId>guava-agent</artifactId>
-        </dependency>
         <dependency>
           <groupId>commons-io</groupId>
           <artifactId>commons-io</artifactId>
@@ -306,18 +290,20 @@
       </activation>
       <properties>
         <release.version>8</release.version>
-        <testng-foundation.version>3.0.1-j8</testng-foundation.version>
+        <testng-foundation.version>3.0.3-j8</testng-foundation.version>
         <selenium.version>3.141.59</selenium.version>
         <guava.version>30.1.1-jre</guava.version>
         <htmlunit.version>2.52.0</htmlunit.version>
         <jcommander.version>1.78</jcommander.version>
         <mockito.version>3.1.0</mockito.version>
         <!-- managed to resolve identified threat -->
+        <websocket-client.version>9.4.43.v20210629</websocket-client.version>
+        <!-- managed to resolve identified threat -->
         <okhttp.version>4.9.1</okhttp.version>
         <!-- override of default conflict resolution -->
-        <okio.version>2.8.0</okio.version>
+        <okio.version>2.10.0</okio.version>
         <!-- override of default conflict resolution -->
-        <kotlin.version>1.4.10</kotlin.version>
+        <kotlin.version>1.5.20</kotlin.version>
       </properties>
       <dependencyManagement>
         <dependencies>
@@ -326,12 +312,6 @@
             <artifactId>testng-foundation</artifactId>
             <version>${testng-foundation.version}</version>
           </dependency>
-          <!-- TestNG 7.4.0 is incompatible with current 'surefire-testng' provider -->
-          <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>7.3.0</version>
-          </dependency>
           <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/selenium2Deps.gradle b/selenium2Deps.gradle
@@ -7,9 +7,7 @@ tasks.withType(JavaCompile) {
 
 dependencies {
   selenium2Compile configurations.compile
-  selenium2Compile 'com.nordstrom.tools:testng-foundation:3.0.1-j7'
-  selenium2Compile 'com.nordstrom.tools:guava-agent:30.1'
-  selenium2Compile('com.google.guava:guava:30.1.1-android') { force = true }
+  selenium2Compile 'com.nordstrom.tools:testng-foundation:3.0.3-j7'
   selenium2Compile 'commons-io:commons-io:2.4'
   selenium2Compile('org.seleniumhq.selenium:selenium-server:2.53.1') {
     exclude group: 'org.seleniumhq.selenium', module: 'selenium-java'
@@ -20,6 +18,7 @@ dependencies {
   selenium2Compile('org.bouncycastle:bcprov-jdk15on:1.68') { force = true }
   selenium2Compile('org.apache.httpcomponents:httpmime:4.5.13') { force = true }
   selenium2Compile('org.apache.httpcomponents:httpclient:4.5.13') { force = true }
+  selenium2Compile('org.eclipse.jetty.websocket:websocket-client:9.2.30.v20200428') { force = true }
   testCompile 'org.seleniumhq.selenium:htmlunit-driver:2.21'
   testCompile 'org.mockito:mockito-core:2.25.0'
 }
diff --git a/selenium3Deps.gradle b/selenium3Deps.gradle
@@ -7,7 +7,7 @@ tasks.withType(JavaCompile) {
 
 dependencies {
   selenium3Compile configurations.compile
-  selenium3Compile 'com.nordstrom.tools:testng-foundation:3.0.1-j8'
+  selenium3Compile 'com.nordstrom.tools:testng-foundation:3.0.3-j8'
   selenium3Compile('com.google.guava:guava:30.1.1-jre') { force = true }
   selenium3Compile('com.beust:jcommander:1.78') { force = true }
   selenium3Compile 'commons-io:commons-io:2.6'
@@ -24,6 +24,7 @@ dependencies {
   }
   selenium3Compile 'org.seleniumhq.selenium:htmlunit-driver:2.52.0'
   selenium3Compile('com.squareup.okhttp3:okhttp:4.9.1') { force = true }
-  selenium3Compile('com.squareup.okio:okio:2.8.0') { force = true }
+  selenium3Compile('com.squareup.okio:okio:2.10.0') { force = true }
+  selenium3Compile('org.eclipse.jetty.websocket:websocket-client:9.4.43.v20210629') { force = true }
   testCompile 'org.mockito:mockito-core:3.1.0'
 }