From 87e94e5973a5e860d469a0e45c73fa568cf5112d Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Fri, 28 Aug 2020 19:55:01 -0700 Subject: [PATCH 1/3] Remove unused dependencies, add missing explicit dependencies and use proper configuration for other dependencies --- build.gradle | 42 ++++++++++++++++++++++++++++++++---------- gradle.properties | 6 +++++- 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index e4dabf4ce4..b17f6d9f9b 100644 --- a/build.gradle +++ b/build.gradle @@ -14,28 +14,50 @@ project.configurations { } project.dependencies { + api("junit:junit:${junitVersion}") + api("org.seleniumhq.selenium:selenium-api:${seleniumVersion}") + implementation("commons-io:commons-io:${commonsIoVersion}") + implementation("com.fasterxml.jackson.core:jackson-annotations:${jacksonAnnotationsVersion}") + implementation("org.bouncycastle:bcprov-jdk15on:${bouncycastleVersion}") + + //api "org.seleniumhq.selenium:selenium-server:${seleniumVersion}" + implementation("org.seleniumhq.selenium:selenium-firefox-driver:${seleniumVersion}") + api("org.seleniumhq.selenium:selenium-support:${seleniumVersion}") + implementation("org.seleniumhq.selenium:selenium-remote-driver:${seleniumVersion}") + implementation("org.seleniumhq.selenium:selenium-chrome-driver:${seleniumVersion}") + implementation("org.seleniumhq.selenium:jetty-repacked:${jettyRepackagedVersion}") + + api("org.apache.httpcomponents:httpcore:${httpcoreVersion}") + implementation("com.google.guava:guava:${guavaVersion}") + api("org.apache.httpcomponents:httpclient:${httpclientVersion}") + api("org.hamcrest:hamcrest-core:${hamcrestCoreVersion}") + implementation("org.apache.commons:commons-text:${commonsTextVersion}") + implementation("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}") + implementation("org.apache.httpcomponents:httpmime:${httpmimeVersion}") + implementation("org.apache.commons:commons-collections4:${commonsCollections4Version}") + implementation("net.sf.opencsv:opencsv:${opencsvVersion}") + implementation("javax.servlet:javax.servlet-api:${servletApiVersion}") // originally 3.1.0 aspectj "org.aspectj:aspectjtools:${aspectjVersion}" implementation "org.slf4j:slf4j-log4j12:${slf4jLog4j12Version}" // Suppresses unwanted logging from remoteapi and webdriver - implementation "com.github.lookfirst:sardine:${project.lookfirstSardineVersion}" - implementation "com.googlecode.json-simple:json-simple:${jsonSimpleVersion}" - implementation "javax.xml.bind:jaxb-api:${jaxbVersion}" + api "com.github.lookfirst:sardine:${project.lookfirstSardineVersion}" + api "com.googlecode.json-simple:json-simple:${jsonSimpleVersion}" + //implementation "javax.xml.bind:jaxb-api:${jaxbVersion}" implementation "com.sun.xml.bind:jaxb-impl:${jaxbVersion}" implementation "com.sun.xml.bind:jaxb-core:${jaxbVersion}" - implementation "commons-beanutils:commons-beanutils:${commonsBeanutilsVersion}" + api "commons-beanutils:commons-beanutils:${commonsBeanutilsVersion}" implementation "org.apache.tika:tika-core:${tikaVersion}" implementation "org.apache.commons:commons-compress:${commonsCompressVersion}" - implementation "org.apache.commons:commons-lang3:${commonsLang3Version}" - implementation "org.apache.commons:commons-math3:${commonsMath3Version}" + api "org.apache.commons:commons-lang3:${commonsLang3Version}" + //implementation "org.apache.commons:commons-math3:${commonsMath3Version}" implementation "org.apache.pdfbox:pdfbox:${pdfboxVersion}" - implementation "org.apache.poi:poi:${poiVersion}" + api "org.apache.poi:poi:${poiVersion}" implementation "org.apache.poi:poi-ooxml:${poiVersion}" implementation "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}" implementation "org.bouncycastle:bcpg-jdk15on:${bouncycastleVersion}" implementation "org.jetbrains:annotations:${annotationsVersion}" - api "org.mock-server:mockserver-netty:${mockserverVersion}" - api "org.seleniumhq.selenium:selenium-server:${seleniumVersion}" + //api "org.mock-server:mockserver-netty:${mockserverVersion}" runtimeOnly "org.aspectj:aspectjrt:${aspectjVersion}" - implementation "org.aspectj:aspectjtools:${aspectjVersion}" + api "org.aspectj:aspectjtools:${aspectjVersion}" implementation "org.reflections:reflections:${reflectionsVersion}" uiTestRuntimeOnly "org.aspectj:aspectjrt:${aspectjVersion}" diff --git a/gradle.properties b/gradle.properties index 41851fbffe..4144855868 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,11 @@ aspectjVersion=1.9.6 +commonsTextVersion=1.3 reflectionsVersion=0.9.10 +hamcrestCoreVersion=1.3 lookfirstSardineVersion=5.7 +jettyRepackagedVersion=9.4.12.v20180830 seleniumVersion=3.141.59 -mockserverVersion=5.5.1 +#mockserverVersion=5.5.1 + labkeySchemasTestVersion=20.7.0 From 5772f5e8015007fc37c9bdb66774ddc88a72f77a Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Sun, 30 Aug 2020 14:03:35 -0700 Subject: [PATCH 2/3] Restore some dependencies used outside testAutomation --- build.gradle | 4 ++-- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index b17f6d9f9b..c8070003a1 100644 --- a/build.gradle +++ b/build.gradle @@ -48,14 +48,14 @@ project.dependencies { implementation "org.apache.tika:tika-core:${tikaVersion}" implementation "org.apache.commons:commons-compress:${commonsCompressVersion}" api "org.apache.commons:commons-lang3:${commonsLang3Version}" - //implementation "org.apache.commons:commons-math3:${commonsMath3Version}" + implementation "org.apache.commons:commons-math3:${commonsMath3Version}" // used by test classes in targetedms implementation "org.apache.pdfbox:pdfbox:${pdfboxVersion}" api "org.apache.poi:poi:${poiVersion}" implementation "org.apache.poi:poi-ooxml:${poiVersion}" implementation "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}" implementation "org.bouncycastle:bcpg-jdk15on:${bouncycastleVersion}" implementation "org.jetbrains:annotations:${annotationsVersion}" - //api "org.mock-server:mockserver-netty:${mockserverVersion}" + implementation "org.mock-server:mockserver-netty:${mockserverNettyVersion}" // used by test classes in accounts runtimeOnly "org.aspectj:aspectjrt:${aspectjVersion}" api "org.aspectj:aspectjtools:${aspectjVersion}" implementation "org.reflections:reflections:${reflectionsVersion}" diff --git a/gradle.properties b/gradle.properties index 4144855868..1588a7ea8a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,6 @@ hamcrestCoreVersion=1.3 lookfirstSardineVersion=5.7 jettyRepackagedVersion=9.4.12.v20180830 seleniumVersion=3.141.59 -#mockserverVersion=5.5.1 +mockserverNettyVersion=5.5.1 labkeySchemasTestVersion=20.7.0 From e5661bcf17339f4cd0a7866d5761befb1226e442 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Thu, 17 Sep 2020 07:11:20 -0700 Subject: [PATCH 3/3] better formatting for fun and profit --- build.gradle | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index c8070003a1..5952c53c7a 100644 --- a/build.gradle +++ b/build.gradle @@ -14,29 +14,29 @@ project.configurations { } project.dependencies { - api("junit:junit:${junitVersion}") - api("org.seleniumhq.selenium:selenium-api:${seleniumVersion}") - implementation("commons-io:commons-io:${commonsIoVersion}") - implementation("com.fasterxml.jackson.core:jackson-annotations:${jacksonAnnotationsVersion}") - implementation("org.bouncycastle:bcprov-jdk15on:${bouncycastleVersion}") + api("junit:junit:${junitVersion}") + api("org.seleniumhq.selenium:selenium-api:${seleniumVersion}") + implementation("commons-io:commons-io:${commonsIoVersion}") + implementation("com.fasterxml.jackson.core:jackson-annotations:${jacksonAnnotationsVersion}") + implementation("org.bouncycastle:bcprov-jdk15on:${bouncycastleVersion}") //api "org.seleniumhq.selenium:selenium-server:${seleniumVersion}" - implementation("org.seleniumhq.selenium:selenium-firefox-driver:${seleniumVersion}") - api("org.seleniumhq.selenium:selenium-support:${seleniumVersion}") - implementation("org.seleniumhq.selenium:selenium-remote-driver:${seleniumVersion}") - implementation("org.seleniumhq.selenium:selenium-chrome-driver:${seleniumVersion}") - implementation("org.seleniumhq.selenium:jetty-repacked:${jettyRepackagedVersion}") - - api("org.apache.httpcomponents:httpcore:${httpcoreVersion}") - implementation("com.google.guava:guava:${guavaVersion}") - api("org.apache.httpcomponents:httpclient:${httpclientVersion}") - api("org.hamcrest:hamcrest-core:${hamcrestCoreVersion}") - implementation("org.apache.commons:commons-text:${commonsTextVersion}") - implementation("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}") - implementation("org.apache.httpcomponents:httpmime:${httpmimeVersion}") - implementation("org.apache.commons:commons-collections4:${commonsCollections4Version}") - implementation("net.sf.opencsv:opencsv:${opencsvVersion}") - implementation("javax.servlet:javax.servlet-api:${servletApiVersion}") // originally 3.1.0 + implementation("org.seleniumhq.selenium:selenium-firefox-driver:${seleniumVersion}") + api("org.seleniumhq.selenium:selenium-support:${seleniumVersion}") + implementation("org.seleniumhq.selenium:selenium-remote-driver:${seleniumVersion}") + implementation("org.seleniumhq.selenium:selenium-chrome-driver:${seleniumVersion}") + implementation("org.seleniumhq.selenium:jetty-repacked:${jettyRepackagedVersion}") + + api("org.apache.httpcomponents:httpcore:${httpcoreVersion}") + implementation("com.google.guava:guava:${guavaVersion}") + api("org.apache.httpcomponents:httpclient:${httpclientVersion}") + api("org.hamcrest:hamcrest-core:${hamcrestCoreVersion}") + implementation("org.apache.commons:commons-text:${commonsTextVersion}") + implementation("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}") + implementation("org.apache.httpcomponents:httpmime:${httpmimeVersion}") + implementation("org.apache.commons:commons-collections4:${commonsCollections4Version}") + implementation("net.sf.opencsv:opencsv:${opencsvVersion}") + implementation("javax.servlet:javax.servlet-api:${servletApiVersion}") // originally 3.1.0 aspectj "org.aspectj:aspectjtools:${aspectjVersion}" implementation "org.slf4j:slf4j-log4j12:${slf4jLog4j12Version}" // Suppresses unwanted logging from remoteapi and webdriver api "com.github.lookfirst:sardine:${project.lookfirstSardineVersion}"