Skip to content

Commit

Permalink
Build for Java 8; upgrade dependencies and plugins (#226)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sbabcoc
sbabcoc authored Jun 12, 2022
1 parent 4680ba6 commit b72067e
Show file tree
Hide file tree
Showing 16 changed files with 39 additions and 1,277 deletions.
16 changes: 8 additions & 8 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ plugins {
id 'jacoco'
id 'signing'
id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
id 'pl.allegro.tech.build.axion-release' version '1.13.6'
id 'pl.allegro.tech.build.axion-release' version '1.13.14'
}

group = 'com.nordstrom.ui-tools'
description = 'Selenium Foundation'

if (!project.hasProperty('profile')) {
ext.profile = 'selenium2'
ext.profile = 'selenium3'
} else {
assert ['selenium2', 'selenium3'].contains(profile)
assert ['selenium3'].contains(profile)
}

apply from: "${profile}Deps.gradle"
Expand Down Expand Up @@ -48,7 +48,7 @@ clean {
}

jacoco {
toolVersion = '0.8.5'
toolVersion = '0.8.8'
reportsDirectory = file("${buildDir}/customJacocoReportDir")
}

Expand Down Expand Up @@ -208,10 +208,10 @@ repositories {

dependencies {
constraints {
api 'com.nordstrom.tools:java-utils:2.2.0'
api 'com.nordstrom.tools:settings:2.3.11'
api 'com.nordstrom.tools:junit-foundation:16.0.3'
api 'com.github.sbabcoc:logback-testng:1.3.5'
api 'com.nordstrom.tools:java-utils:3.0.0'
api 'com.nordstrom.tools:settings:3.0.0'
api 'com.nordstrom.tools:junit-foundation:17.0.0'
api 'com.github.sbabcoc:logback-testng:2.0.0'
api 'org.hamcrest:hamcrest-core:2.2'
api 'org.yaml:snakeyaml:1.30'
}
Expand Down
218 changes: 23 additions & 195 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@
<revision>@projectVersion@</revision>
<timestamp>@projectTimestamp@</timestamp>
<selenium-api>@seleniumApi@</selenium-api>
<java-utils.version>2.2.0</java-utils.version>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<java-utils.version>3.0.0</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.3.0</javadoc-plugin.version>
<settings.version>2.3.11</settings.version>
<junit-foundation.version>16.0.3</junit-foundation.version>
<logback-testng.version>1.3.5</logback-testng.version>
<javadoc-plugin.version>3.4.0</javadoc-plugin.version>
<settings.version>3.0.0</settings.version>
<junit-foundation.version>17.0.0</junit-foundation.version>
<logback-testng.version>2.0.0</logback-testng.version>
<sonar.language>java</sonar.language>
<jacoco.version>0.8.7</jacoco.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>
<jacoco.version>0.8.8</jacoco.version>
<build-helper-plugin.version>3.3.0</build-helper-plugin.version>
<dependency-plugin.version>3.3.0</dependency-plugin.version>
<clean-plugin.version>3.2.0</clean-plugin.version>
<hamcrest.version>2.2</hamcrest.version>
<!-- managed to resolve identified threat -->
<snakeyaml.version>1.30</snakeyaml.version>
Expand Down Expand Up @@ -131,211 +131,34 @@
</dependencies>

<profiles>
<profile>
<id>selenium2</id>
<activation>
<property>
<name>${selenium-api}</name>
<value>s2</value>
</property>
</activation>
<properties>
<release.version>7</release.version>
<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>
<!-- managed to resolve identified threat -->
<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>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.nordstrom.tools</groupId>
<artifactId>testng-foundation</artifactId>
<version>${testng-foundation.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-server</artifactId>
<version>${selenium.version}</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<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>
<version>${jsoup.version}</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>htmlunit-driver</artifactId>
<version>${htmlunit.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<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>
<version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>${httpcomponents.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpcomponents.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.nordstrom.tools</groupId>
<artifactId>testng-foundation</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-server</artifactId>
<exclusions>
<exclusion>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<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>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<directory>target-s2</directory>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-source</id>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>src/selenium2/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>selenium3</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>${selenium-api}</name>
<value>s3</value>
</property>
</activation>
<properties>
<release.version>8</release.version>
<testng-foundation.version>3.0.6-j8</testng-foundation.version>
<testng-foundation.version>4.0.0-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>
<httpcomponents.version>4.5.13</httpcomponents.version>
<jsoup.version>1.14.2</jsoup.version>
<jsoup.version>1.15.1</jsoup.version>
<htmlunit.version>2.62.0</htmlunit.version>
<jcommander.version>1.82</jcommander.version>
<mockito.version>3.1.0</mockito.version>
<mockito.version>4.6.1</mockito.version>
<!-- managed to resolve identified threat -->
<websocket-client.version>9.4.43.v20210629</websocket-client.version>
<websocket-client.version>9.4.46.v20220331</websocket-client.version>
<!-- managed to resolve identified threat -->
<okhttp.version>4.9.1</okhttp.version>
<okhttp.version>4.9.3</okhttp.version>
<!-- override of default conflict resolution -->
<okio.version>2.10.0</okio.version>
<!-- override of default conflict resolution -->
<kotlin.version>1.5.20</kotlin.version>
<kotlin.version>1.7.0</kotlin.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -406,6 +229,11 @@
<artifactId>okio</artifactId>
<version>${okio.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-common</artifactId>
Expand Down
56 changes: 0 additions & 56 deletions selenium2Deps.gradle
View file

This file was deleted.

12 changes: 7 additions & 5 deletions selenium3Deps.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,21 @@ sourceSets {

dependencies {
constraints {
api 'com.nordstrom.tools:testng-foundation:3.0.10-j8'
api 'com.nordstrom.tools:testng-foundation:4.0.0-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.jsoup:jsoup:1.15.1'
api 'org.apache.commons:commons-lang3:3.12.0'
api 'com.google.guava:guava:31.1-jre'
api 'com.beust:jcommander:1.82'
api 'com.squareup.okhttp3:okhttp:4.9.1'
api 'com.squareup.okhttp3:okhttp:4.9.3'
api 'com.squareup.okio:okio:2.10.0'
api 'org.eclipse.jetty.websocket:websocket-client:9.4.43.v20210629'
api 'org.eclipse.jetty.websocket:websocket-client:9.4.46.v20220331'
api 'org.jetbrains.kotlin:kotlin-stdlib:1.7.0'
api 'org.jetbrains.kotlin:kotlin-stdlib-common:1.7.0'
testImplementation 'org.seleniumhq.selenium:htmlunit-driver:2.62.0'
testImplementation 'org.mockito:mockito-core:3.1.0'
testImplementation 'org.mockito:mockito-core:4.6.1'
}
api 'com.nordstrom.tools:testng-foundation'
api('org.seleniumhq.selenium:selenium-server') {
Expand Down
Loading

0 comments on commit b72067e

Please sign in to comment.