Add direct dependencies to favor managed versions (#204)

sbabcoc · Mar 8, 2022 · f0ea966 · f0ea966
1 parent 73c44df
commit f0ea966
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -221,6 +221,8 @@ dependencies {
   api('com.github.sbabcoc:logback-testng') {
     exclude group: 'org.testng', module: 'testng'
   }
+  api 'org.hamcrest:hamcrest-core'
+  api 'org.yaml:snakeyaml'
 }
 
 test {

diff --git a/pom.xml b/pom.xml
@@ -95,11 +95,6 @@
         <artifactId>snakeyaml</artifactId>
         <version>${snakeyaml.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>websocket-client</artifactId>
-        <version>${websocket-client.version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
   <dependencies>
@@ -125,6 +120,14 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+    </dependency>
   </dependencies>
 
   <profiles>
@@ -141,6 +144,7 @@
         <testng-foundation.version>3.0.6-j7</testng-foundation.version>
         <selenium.version>2.53.1</selenium.version>
         <commons-io.version>2.6</commons-io.version>
+        <guava.version>30.1.1-android</guava.version>
         <jsoup.version>1.13.1</jsoup.version>
         <htmlunit.version>2.24</htmlunit.version>
         <mockito.version>2.25.0</mockito.version>
@@ -173,6 +177,11 @@
             <artifactId>selenium-support</artifactId>
             <version>${selenium.version}</version>
           </dependency>
+          <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+          </dependency>
           <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
@@ -188,6 +197,11 @@
             <artifactId>mockito-core</artifactId>
             <version>${mockito.version}</version>
           </dependency>
+          <dependency>
+            <groupId>org.eclipse.jetty.websocket</groupId>
+            <artifactId>websocket-client</artifactId>
+            <version>${websocket-client.version}</version>
+          </dependency>
           <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
@@ -233,10 +247,34 @@
           <groupId>org.seleniumhq.selenium</groupId>
           <artifactId>selenium-support</artifactId>
         </dependency>
+        <dependency>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </dependency>
         <dependency>
           <groupId>org.jsoup</groupId>
           <artifactId>jsoup</artifactId>
         </dependency>
+        <dependency>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcpkix-jdk15on</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcprov-jdk15on</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpmime</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.eclipse.jetty.websocket</groupId>
+          <artifactId>websocket-client</artifactId>
+        </dependency>
         <dependency>
           <groupId>org.seleniumhq.selenium</groupId>
           <artifactId>htmlunit-driver</artifactId>
@@ -351,6 +389,11 @@
             <artifactId>mockito-core</artifactId>
             <version>${mockito.version}</version>
           </dependency>
+          <dependency>
+            <groupId>org.eclipse.jetty.websocket</groupId>
+            <artifactId>websocket-client</artifactId>
+            <version>${websocket-client.version}</version>
+          </dependency>
           <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp-bom</artifactId>
@@ -425,6 +468,30 @@
           <groupId>org.jsoup</groupId>
           <artifactId>jsoup</artifactId>
         </dependency>
+        <dependency>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>com.beust</groupId>
+          <artifactId>jcommander</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>com.squareup.okhttp3</groupId>
+          <artifactId>okhttp</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>com.squareup.okio</groupId>
+          <artifactId>okio</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.eclipse.jetty.websocket</groupId>
+          <artifactId>websocket-client</artifactId>
+        </dependency>
         <dependency>
           <groupId>org.seleniumhq.selenium</groupId>
           <artifactId>htmlunit-driver</artifactId>

diff --git a/selenium2Deps.gradle b/selenium2Deps.gradle
@@ -28,6 +28,7 @@ dependencies {
     api 'commons-io:commons-io:2.4'
     api 'org.seleniumhq.selenium:selenium-server:2.53.1'
     api 'org.seleniumhq.selenium:selenium-support:2.53.1'
+    api 'com.google.guava:guava:30.1.1-android'
     api 'org.jsoup:jsoup:1.13.1'
     api 'org.bouncycastle:bcpkix-jdk15on:1.68'
     api 'org.bouncycastle:bcprov-jdk15on:1.68'
@@ -43,7 +44,13 @@ dependencies {
     exclude group: 'org.seleniumhq.selenium', module: 'selenium-java'
   }
   api 'org.seleniumhq.selenium:selenium-support'
+  api 'com.google.guava:guava'
   api 'org.jsoup:jsoup'
+  api 'org.bouncycastle:bcpkix-jdk15on'
+  api 'org.bouncycastle:bcprov-jdk15on'
+  api 'org.apache.httpcomponents:httpmime'
+  api 'org.apache.httpcomponents:httpclient'
+  api 'org.eclipse.jetty.websocket:websocket-client'
   testImplementation 'org.seleniumhq.selenium:htmlunit-driver'
   testImplementation 'org.mockito:mockito-core'
 }
diff --git a/selenium3Deps.gradle b/selenium3Deps.gradle
@@ -52,6 +52,12 @@ dependencies {
   api 'org.seleniumhq.selenium:selenium-support'
   api 'org.apache.httpcomponents:httpclient'
   api 'org.jsoup:jsoup'
+  api 'org.apache.commons:commons-lang3'
+  api 'com.google.guava:guava'
+  api 'com.beust:jcommander'
+  api 'com.squareup.okhttp3:okhttp'
+  api 'com.squareup.okio:okio'
+  api 'org.eclipse.jetty.websocket:websocket-client'
   testImplementation 'org.seleniumhq.selenium:htmlunit-driver'
   testImplementation 'org.mockito:mockito-core'
 }