Maven dependency management => Gradle constraints (#203)

sbabcoc · Mar 8, 2022 · 7e8f1f9 · 7e8f1f9
1 parent 750a7b2
commit 7e8f1f9
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 35 deletions.
diff --git a/build.gradle b/build.gradle
@@ -207,14 +207,20 @@ repositories {
 }
 
 dependencies {
-  api 'com.nordstrom.tools:java-utils:2.1.0'
-  api 'com.nordstrom.tools:settings:2.3.10'
-  api 'com.nordstrom.tools:junit-foundation:15.3.4'
-  api('com.github.sbabcoc:logback-testng:1.3.4') {
+  constraints {
+    api 'com.nordstrom.tools:java-utils:2.1.0'
+    api 'com.nordstrom.tools:settings:2.3.10'
+    api 'com.nordstrom.tools:junit-foundation:15.3.4'
+    api 'com.github.sbabcoc:logback-testng:1.3.4'
+    api 'org.hamcrest:hamcrest-core:2.2'
+    api 'org.yaml:snakeyaml:1.28'
+  }
+  api 'com.nordstrom.tools:java-utils'
+  api 'com.nordstrom.tools:settings'
+  api 'com.nordstrom.tools:junit-foundation'
+  api('com.github.sbabcoc:logback-testng') {
     exclude group: 'org.testng', module: 'testng'
   }
-  api('org.hamcrest:hamcrest-core') { version { strictly '2.2' } }
-  api('org.yaml:snakeyaml') { version { strictly '1.28' } }
 }
 
 test {

diff --git a/pom.xml b/pom.xml
@@ -417,10 +417,10 @@
           <groupId>org.seleniumhq.selenium</groupId>
           <artifactId>selenium-support</artifactId>
         </dependency>
-          <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-          </dependency>
+        <dependency>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient</artifactId>
+        </dependency>
         <dependency>
           <groupId>org.jsoup</groupId>
           <artifactId>jsoup</artifactId>

diff --git a/selenium2Deps.gradle b/selenium2Deps.gradle
@@ -23,18 +23,27 @@ sourceSets {
 }
 
 dependencies {
-  api 'com.nordstrom.tools:testng-foundation:3.0.6-j7'
-  api 'commons-io:commons-io:2.4'
-  api('org.seleniumhq.selenium:selenium-server:2.53.1') {
+  constraints {
+    api 'com.nordstrom.tools:testng-foundation:3.0.6-j7'
+    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 'org.jsoup:jsoup:1.13.1'
+    api 'org.bouncycastle:bcpkix-jdk15on:1.68'
+    api 'org.bouncycastle:bcprov-jdk15on:1.68'
+    api 'org.apache.httpcomponents:httpmime:4.5.13'
+    api 'org.apache.httpcomponents:httpclient:4.5.13'
+    api 'org.eclipse.jetty.websocket:websocket-client:9.2.30.v20200428'
+    testImplementation 'org.seleniumhq.selenium:htmlunit-driver:2.24'
+    testImplementation 'org.mockito:mockito-core:2.25.0'
+  }
+  api 'com.nordstrom.tools:testng-foundation'
+  api 'commons-io:commons-io'
+  api('org.seleniumhq.selenium:selenium-server') {
     exclude group: 'org.seleniumhq.selenium', module: 'selenium-java'
   }
-  api 'org.seleniumhq.selenium:selenium-support:2.53.1'
-  api 'org.jsoup:jsoup:1.13.1'
-  api('org.bouncycastle:bcpkix-jdk15on') { version { strictly '1.68' } }
-  api('org.bouncycastle:bcprov-jdk15on') { version { strictly '1.68' } }
-  api('org.apache.httpcomponents:httpmime') { version { strictly '4.5.13' } }
-  api('org.apache.httpcomponents:httpclient') { version { strictly '4.5.13' } }
-  api('org.eclipse.jetty.websocket:websocket-client') { version { strictly '9.2.30.v20200428' } }
-  testImplementation 'org.seleniumhq.selenium:htmlunit-driver:2.24'
-  testImplementation 'org.mockito:mockito-core:2.25.0'
+  api 'org.seleniumhq.selenium:selenium-support'
+  api 'org.jsoup:jsoup'
+  testImplementation 'org.seleniumhq.selenium:htmlunit-driver'
+  testImplementation 'org.mockito:mockito-core'
 }
diff --git a/selenium3Deps.gradle b/selenium3Deps.gradle
@@ -23,12 +23,23 @@ sourceSets {
 }
 
 dependencies {
-  api 'com.nordstrom.tools:testng-foundation:3.0.6-j8'
-  api('org.apache.commons:commons-lang3') { version { strictly '3.12.0' } }
-  api('com.google.guava:guava') { version { strictly '30.1.1-jre' } }
-  api 'org.apache.httpcomponents:httpclient:4.5.13'
-  api('com.beust:jcommander') { version { strictly '1.78' } }
-  api('org.seleniumhq.selenium:selenium-server:3.141.59') {
+  constraints {
+    api 'com.nordstrom.tools:testng-foundation:3.0.6-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'
+    api 'org.jsoup:jsoup:1.14.2'
+    api 'org.apache.commons:commons-lang3:3.12.0'
+    api 'com.google.guava:guava:30.1.1-jre'
+    api 'com.beust:jcommander:1.78'
+    api 'com.squareup.okhttp3:okhttp:4.9.1'
+    api 'com.squareup.okio:okio:2.10.0'
+    api 'org.eclipse.jetty.websocket:websocket-client:9.4.43.v20210629'
+    testImplementation 'org.seleniumhq.selenium:htmlunit-driver:2.59.0'
+    testImplementation 'org.mockito:mockito-core:3.1.0'
+  }
+  api 'com.nordstrom.tools:testng-foundation'
+  api('org.seleniumhq.selenium:selenium-server') {
     exclude module: 'selenium-chrome-driver'
     exclude module: 'selenium-edge-driver'
     exclude module: 'selenium-firefox-driver'
@@ -38,11 +49,9 @@ dependencies {
     exclude module: 'selenium-safari-driver'
     exclude module: 'htmlunit-driver'
   }
-  api 'org.seleniumhq.selenium:selenium-support:3.141.59'
-  api 'org.jsoup:jsoup:1.14.2'
-  api('com.squareup.okhttp3:okhttp') { version { strictly '4.9.1' } }
-  api('com.squareup.okio:okio') { version { strictly '2.10.0' } }
-  api('org.eclipse.jetty.websocket:websocket-client') { version { strictly '9.4.43.v20210629' } }
-  testImplementation 'org.seleniumhq.selenium:htmlunit-driver:2.59.0'
-  testImplementation 'org.mockito:mockito-core:3.1.0'
+  api 'org.seleniumhq.selenium:selenium-support'
+  api 'org.apache.httpcomponents:httpclient'
+  api 'org.jsoup:jsoup'
+  testImplementation 'org.seleniumhq.selenium:htmlunit-driver'
+  testImplementation 'org.mockito:mockito-core'
 }