From 7d71beeac732a01eb50bfdb498e44bfc9fcdf13b Mon Sep 17 00:00:00 2001 From: abaudet Date: Tue, 5 Jan 2021 22:48:26 +0400 Subject: [PATCH] misc(deps) Fix dependency convergence + test dependency convergence --- README.adoc | 58 ++-- ogham-core/pom.xml | 11 + ogham-email-sendgrid-common/pom.xml | 14 +- ogham-template-thymeleaf-common/pom.xml | 7 + .../resources/standalone/maven/pom.xml.ftl | 19 ++ ogham-test-utils/pom.xml | 70 +++-- pom.xml | 254 +++++++++++++++++- 7 files changed, 370 insertions(+), 63 deletions(-) diff --git a/README.adoc b/README.adoc index 7758acdf5f..2d21954199 100644 --- a/README.adoc +++ b/README.adoc @@ -19,7 +19,7 @@ endif::[] image:https://img.shields.io/maven-central/v/fr.sii.ogham/ogham-all.svg["Latest Release Standalone", link="https://mvnrepository.com/artifact/fr.sii.ogham/ogham-all/"] image:https://img.shields.io/badge/License-Apache%202.0-lightgrey.svg["License", link="https://opensource.org/licenses/Apache-2.0"] -image:https://github.com/groupe-sii/ogham/workflows/Build/badge.svg?branch=misc/versions/update["Build Status", link="https://github.com/groupe-sii/ogham/actions?query=workflow%3ABuild"] +image:https://github.com/groupe-sii/ogham/workflows/Build/badge.svg?branch=master["Build Status", link="https://github.com/groupe-sii/ogham/actions?query=workflow%3ABuild"] image:https://sonarcloud.io/api/project_badges/measure?project=fr.sii.ogham%3Aogham-parent&metric=alert_status["Sonar", link="https://sonarcloud.io/dashboard?id=fr.sii.ogham%3Aogham-parent"] image:https://sonarcloud.io/api/project_badges/measure?project=fr.sii.ogham%3Aogham-parent&metric=sqale_rating["Sonar", link="https://sonarcloud.io/dashboard?id=fr.sii.ogham%3Aogham-parent"] @@ -55,7 +55,7 @@ image::https://groupe-sii.github.io/ogham/v3.0.0-SNAPSHOT/presentation/showcase. | https://groupe-sii.github.io/ogham/redirects/nightly-build-site.html[site] | https://groupe-sii.github.io/ogham/redirects/latest-release-code.html[code] -| https://github.com/groupe-sii/ogham/tree/misc/versions/update[code] +| https://github.com/groupe-sii/ogham/tree/master[code] | https://github.com/groupe-sii/ogham/tree/master[code] | https://groupe-sii.github.io/ogham/redirects/latest-release-showcase.html[showcase] @@ -123,7 +123,7 @@ image:src/docs/resources/images/icons/maven-logo.png[Maven,width=118,height=30] ... ---- -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/pom.xml?ts=2[View code of an example pom.xml] +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/pom.xml?ts=2[View code of an example pom.xml] ''' @@ -373,7 +373,7 @@ take a look at https://groupe-sii.github.io/ogham/v3.0.0-SNAPSHOT/user-manual.ht [NOTE] ==== -The samples are available in the https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage[sample-standard-usage sub-project]. +The samples are available in the https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage[sample-standard-usage sub-project]. All samples shown bellow are using SMTP for sending email. See https://groupe-sii.github.io/ogham/v3.0.0-SNAPSHOT/user-manual.html#sendgrid[Sending email through SendGrid] @@ -435,7 +435,7 @@ public class BasicSample { <3> Create a MessagingService instance <4> Send an email with a subject and a simple body. The sender address is automatically set using `ogham.email.from.default-value` property -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/BasicSample.java?ts=2[Source code of the sample]. +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/BasicSample.java?ts=2[Source code of the sample]. _____ @@ -512,7 +512,7 @@ public class HtmlTemplateSample { <5> Indicate the path to the HTML template file (in the classpath) <6> Use any bean object for replacing variables in template -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlTemplateSample.java?ts=2[Source code of the sample]. +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlTemplateSample.java?ts=2[Source code of the sample]. ''' @@ -536,7 +536,7 @@ image:src/docs/resources/images/icons/thymeleaf.jpg[width=30,height=30] ThymeLea <2> Use the `name` attribute value in the template <3> Use the `value` attribute value in the template -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/resources/template/thymeleaf/simple.html?ts=2[Source code of the HTML template] +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/resources/template/thymeleaf/simple.html?ts=2[Source code of the HTML template] _____ @@ -613,7 +613,7 @@ image:src/docs/resources/images/icons/java-logo.png[width=16,height=30] Java ---- <1> Subject is no more in Java code -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlTemplateWithSubjectSample.java?ts=2[Source code of the sample] +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlTemplateWithSubjectSample.java?ts=2[Source code of the sample] ''' @@ -639,7 +639,7 @@ image:src/docs/resources/images/icons/thymeleaf.jpg[width=30,height=30] ThymeLea NOTE: The subject of the email will be `Subject of the email - Welcome foo !` -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/resources/template/thymeleaf/simpleWithSubject.html?ts=2[Source code of the HTML template] +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/resources/template/thymeleaf/simpleWithSubject.html?ts=2[Source code of the HTML template] _____ @@ -693,7 +693,7 @@ public class TextTemplateWithSubjectSample { ---- <1> Subject is no more in Java code -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/TextTemplateWithSubjectSample.java?ts=2[Source code of the sample] +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/TextTemplateWithSubjectSample.java?ts=2[Source code of the sample] ''' @@ -710,7 +710,7 @@ Foo bar ${value} NOTE: The subject of the email will be `Welcome foo !` -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/resources/template/freemarker/simpleWithSubject.txt.ftl?ts=2[Source code of the text template] +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/resources/template/freemarker/simpleWithSubject.txt.ftl?ts=2[Source code of the text template] _____ @@ -793,7 +793,7 @@ image:src/docs/resources/images/icons/java-logo.png[width=16,height=30] Java `/template/withImagesAndCss/resources.txt.ftl` for the text alternative) <2> The template context -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlWithImagesAndCssTemplateSample.java?ts=2[Source code of the sample] +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlWithImagesAndCssTemplateSample.java?ts=2[Source code of the sample] ''' @@ -868,7 +868,7 @@ determined <6> Same as <3> <7> The image is not inlined by Ogham. This can be useful to embed it manually. -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/resources/template/withImagesAndCss/resources.html?ts=2[Source code of the HTML template] +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/resources/template/withImagesAndCss/resources.html?ts=2[Source code of the HTML template] ''' @@ -1058,7 +1058,7 @@ The call order between `text()` and `html()` doesn't matter (unlike using `.cont The underlying `Content` is a `MultiContent`. ===== -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlAndTextSample.java?ts=2[Source code of the sample] +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlAndTextSample.java?ts=2[Source code of the sample] _____ @@ -1123,7 +1123,7 @@ extension). The underlying `Content` is a `MultiTemplateContent`. ===== -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlAndTextTemplateSample.java?ts=2[Source code of the sample] +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlAndTextTemplateSample.java?ts=2[Source code of the sample] ''' @@ -1136,7 +1136,7 @@ image:src/docs/resources/images/icons/thymeleaf-text.jpg[width=30,height=30] Tex [[${name}]] [[${value}]] ---- -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/resources/template/thymeleaf/simple.txt?ts=2[Source code of the text template] +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/resources/template/thymeleaf/simple.txt?ts=2[Source code of the text template] ''' @@ -1159,7 +1159,7 @@ image:src/docs/resources/images/icons/thymeleaf-html.jpg[width=30,height=30] HTM ---- -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/resources/template/thymeleaf/simple.html?ts=2[Source code of the HTML template] +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/resources/template/thymeleaf/simple.html?ts=2[Source code of the HTML template] _____ @@ -1232,7 +1232,7 @@ for HTML located at `/template/thymeleaf/simple.html` and one for text located a extension). The HTML template uses Thymeleaf while the text template uses FreeMarker. <2> The object used for evaluation as usual when using templates (same object used for both HTML and text) -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlAndTextMixedTemplateEnginesSample.java?ts=2[Source code of the sample] +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/HtmlAndTextMixedTemplateEnginesSample.java?ts=2[Source code of the sample] ''' @@ -1245,7 +1245,7 @@ image:src/docs/resources/images/icons/freemarker-logo.png[width=60,height=24] Te ${name} ${value} ---- -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/resources/template/mixed/simple.txt.ftl?ts=2[Source code of the text template] +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/resources/template/mixed/simple.txt.ftl?ts=2[Source code of the text template] ''' @@ -1267,7 +1267,7 @@ image:src/docs/resources/images/icons/thymeleaf.jpg[width=30,height=30] HTML tem ---- -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/resources/template/mixed/simple.html?ts=2[Source code of the HTML template] +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/resources/template/mixed/simple.html?ts=2[Source code of the HTML template] _____ @@ -1325,7 +1325,7 @@ image:src/docs/resources/images/icons/java-logo.png[width=16,height=30] Java <1> Attach a PDF file that exists in the classpath to the email. The name of the attachment uses the name of the file <2> Use an `InputStream` and name the attachment -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/WithAttachmentSample.java?ts=2[Source code of the sample] +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/email/WithAttachmentSample.java?ts=2[Source code of the sample] _____ @@ -1369,7 +1369,7 @@ See user guide to read about https://groupe-sii.github.io/ogham/v3.0.0-SNAPSHOT/ [NOTE] ==== -The samples are available in the https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage[sample-standard-usage sub-project]. +The samples are available in the https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage[sample-standard-usage sub-project]. All samples shown bellow are using SMPP for sending SMS. The https://en.wikipedia.org/wiki/Short_Message_Peer-to-Peer[SMPP] protocol @@ -1435,7 +1435,7 @@ public class BasicSample { <9> Send a SMS with a simple message. The sender phone number is automatically set using `ogham.sms.from.default-value` property -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/sms/BasicSample.java?ts=2[Source code of the sample]. +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/sms/BasicSample.java?ts=2[Source code of the sample]. _____ @@ -1503,7 +1503,7 @@ set using `ogham.sms.from.default-value` property <5> Indicate the path to the template file (in the classpath) <6> Use any bean object for replacing variables in template -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/sms/TemplateSample.java?ts=2[Source code of the sample]. +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/sms/TemplateSample.java?ts=2[Source code of the sample]. ''' @@ -1515,7 +1515,7 @@ image:src/docs/resources/images/icons/thymeleaf.jpg[width=30,height=30] ThymeLea [[${name}]] [[${value}]] ---- -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/resources/template/thymeleaf/simple.txt?ts=2[Source code of the template] +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/resources/template/thymeleaf/simple.txt?ts=2[Source code of the template] _____ @@ -1591,7 +1591,7 @@ public class LongMessageSample { } ---- -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/sms/LongMessageSample.java?ts=2[Source code of the sample]. +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/main/java/fr/sii/ogham/sample/standard/sms/LongMessageSample.java?ts=2[Source code of the sample]. @@ -1653,7 +1653,7 @@ image:src/docs/resources/images/icons/maven-logo.png[Maven,width=118,height=30] ---- -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/pom.xml?ts=2[View code of an example pom.xml] +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/pom.xml?ts=2[View code of an example pom.xml] ''' @@ -1780,7 +1780,7 @@ public class EmailTestSample { <15> Assert that received email has no attachment -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/test/java/fr/sii/ogham/sample/test/EmailTestSample.java?ts=2[Source code of the sample]. +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/test/java/fr/sii/ogham/sample/test/EmailTestSample.java?ts=2[Source code of the sample]. _____ @@ -1856,7 +1856,7 @@ public class SmsTestSample { <9> Assert that the recipient phone number is `0601020304` -https://github.com/groupe-sii/ogham/tree/misc/versions/update/sample-standard-usage/src/test/java/fr/sii/ogham/sample/test/SmsTestSample.java?ts=2[Source code of the sample]. +https://github.com/groupe-sii/ogham/tree/master/sample-standard-usage/src/test/java/fr/sii/ogham/sample/test/SmsTestSample.java?ts=2[Source code of the sample]. _____ diff --git a/ogham-core/pom.xml b/ogham-core/pom.xml index f79207217a..eb709db027 100644 --- a/ogham-core/pom.xml +++ b/ogham-core/pom.xml @@ -70,6 +70,17 @@ logback-classic + + + + org.javassist + javassist + + + com.google.guava + guava + + fr.sii.ogham diff --git a/ogham-email-sendgrid-common/pom.xml b/ogham-email-sendgrid-common/pom.xml index 6482dc7687..5713b2f36a 100644 --- a/ogham-email-sendgrid-common/pom.xml +++ b/ogham-email-sendgrid-common/pom.xml @@ -25,16 +25,10 @@ com.sendgrid sendgrid-java - - - - org.mockito - mockito-core - - - + + com.fasterxml.jackson.core jackson-core @@ -47,6 +41,10 @@ com.fasterxml.jackson.core jackson-databind + + org.apache.httpcomponents + httpclient + diff --git a/ogham-template-thymeleaf-common/pom.xml b/ogham-template-thymeleaf-common/pom.xml index b20279e929..86f70e11ee 100644 --- a/ogham-template-thymeleaf-common/pom.xml +++ b/ogham-template-thymeleaf-common/pom.xml @@ -27,6 +27,13 @@ thymeleaf + + + + org.javassist + javassist + + fr.sii.ogham diff --git a/ogham-test-classpath/src/main/resources/standalone/maven/pom.xml.ftl b/ogham-test-classpath/src/main/resources/standalone/maven/pom.xml.ftl index ed82286f37..72d7511a64 100644 --- a/ogham-test-classpath/src/main/resources/standalone/maven/pom.xml.ftl +++ b/ogham-test-classpath/src/main/resources/standalone/maven/pom.xml.ftl @@ -77,6 +77,25 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0-M3 + + + enforce + + + + + + validate + + enforce + + + + diff --git a/ogham-test-utils/pom.xml b/ogham-test-utils/pom.xml index 7c25b1aa7c..2d788c7c17 100644 --- a/ogham-test-utils/pom.xml +++ b/ogham-test-utils/pom.xml @@ -22,10 +22,6 @@ commons-io commons-io - - junit - junit - org.junit.jupiter junit-jupiter @@ -54,11 +50,11 @@ com.icegreen - greenmail + greenmail-junit4 com.icegreen - greenmail-junit4 + greenmail com.icegreen @@ -80,6 +76,10 @@ com.fizzed ch-smpp + + com.github.tomakehurst + wiremock-jre8 + org.xmlunit xmlunit-core @@ -88,10 +88,6 @@ uk.com.robust-it cloning - - com.github.tomakehurst - wiremock-jre8 - org.spockframework spock-core @@ -101,16 +97,25 @@ spring-boot-starter-test provided - - - com.google.guava - guava - org.awaitility awaitility - + + + + + org.hamcrest + hamcrest-core + + + junit + junit + + + com.google.guava + guava + com.fasterxml.jackson.core jackson-core @@ -123,6 +128,34 @@ com.fasterxml.jackson.core jackson-databind + + org.slf4j + slf4j-api + + + org.objenesis + objenesis + + + org.conscrypt + conscrypt-openjdk-uber + + + org.apache.commons + commons-lang3 + + + org.opentest4j + opentest4j + + + org.apache.httpcomponents + httpclient + + + com.sun.activation + jakarta.activation + @@ -130,10 +163,5 @@ junit-platform-testkit test - - ch.qos.logback - logback-classic - test - diff --git a/pom.xml b/pom.xml index f878ad1d75..dc2c771bb4 100644 --- a/pom.xml +++ b/pom.xml @@ -25,18 +25,23 @@ 2.8.0 1.9.4 2.1.6.RELEASE - 3.0.11.RELEASE + 3.0.11.RELEASE ${thymeleaf-v3.version} 3.1.28 2.3.30 1.6.2 - 1.6.5 + 1.6.5 1.7.30 1.2.3 3.11 5.0.9 5.0.9 3.0.0 + 6.0.2 + 3.0.2 1.13.1 1.15 4.7.1 @@ -46,9 +51,11 @@ 8.3.2 1.24.1 1.2.0 - 1.2.2 + 1.2.2 2.12.0 - 0.9.11 + 0.9.11 30.1-jre 4.4.14 4.5.13 @@ -372,6 +379,12 @@ com.sun.mail jakarta.mail ${jakarta-mail.version} + + + com.sun.activation + jakarta.activation + + jakarta.mail @@ -382,6 +395,29 @@ com.sendgrid sendgrid-java ${sendgrid-java.version} + + + + org.mockito + mockito-core + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + + + org.apache.httpcomponents + httpclient + + @@ -389,21 +425,59 @@ com.fizzed ch-smpp ${cloudhopper-fizzed.version} + + + org.slf4j + slf4j-api + + com.cloudhopper ch-smpp ${cloudhopper.version} + + + org.slf4j + slf4j-api + + com.cloudhopper ch-commons-gsm ${cloudhopper-gsm.version} + + + org.slf4j + slf4j-api + + + com.cloudhopper + ch-commons-util + + + + + com.cloudhopper + ch-commons-util + ${cloudhopper-commons-util.version} + + + com.cloudhopper + ch-commons-charset + ${cloudhopper-commons-charset.version} org.jsmpp jsmpp ${jsmpp.version} + + + org.slf4j + slf4j-api + + @@ -452,6 +526,16 @@ org.reflections reflections ${reflections.version} + + + org.javassist + javassist + + + com.google.guava + guava + + com.google.guava @@ -479,16 +563,38 @@ org.thymeleaf thymeleaf ${thymeleaf.version} + + + org.slf4j + slf4j-api + + + org.javassist + javassist + + org.thymeleaf thymeleaf-spring4 ${thymeleaf-v2.version} + + + org.slf4j + slf4j-api + + ognl ognl ${ognl.version} + + + org.javassist + javassist + + org.freemarker @@ -530,6 +636,12 @@ ch.qos.logback logback-classic ${logback.version} + + + org.slf4j + slf4j-api + + @@ -557,6 +669,12 @@ junit junit ${junit.version} + + + org.hamcrest + hamcrest-core + + org.junit @@ -565,15 +683,38 @@ pom import + + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} + + + junit + junit + + + org.mockito mockito-core ${mockito.version} + + + org.objenesis + objenesis + + org.mockito mockito-junit-jupiter ${mockito-junit-jupiter.version} + + + org.junit.jupiter + junit-jupiter-api + + net.bytebuddy @@ -599,17 +740,41 @@ com.sun.mail javax.mail + + junit + junit + com.icegreen greenmail-junit4 ${greenmail.version} + + + org.slf4j + slf4j-api + + + junit + junit + + com.icegreen greenmail-junit5 ${greenmail.version} + + + org.slf4j + slf4j-api + + + junit + junit + + nl.jqno.equalsverifier @@ -625,16 +790,78 @@ uk.com.robust-it cloning ${cloning.version} + + + org.objenesis + objenesis + + com.github.tomakehurst wiremock-jre8 ${wiremock.version} + + + org.hamcrest + hamcrest-core + + + org.slf4j + slf4j-api + + + com.google.guava + guava + + + org.conscrypt + conscrypt-openjdk-uber + + + org.apache.commons + commons-lang3 + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + + + org.opentest4j + opentest4j + + + commons-io + commons-io + + + org.xmlunit + xmlunit-core + + + org.apache.httpcomponents + httpclient + + org.spockframework spock-core ${spock.version} + + + junit + junit + + org.codehaus.groovy @@ -680,6 +907,12 @@ org.awaitility awaitility ${awaitility.version} + + + org.hamcrest + hamcrest + + @@ -715,6 +948,17 @@ pom import + + org.springframework.boot + spring-boot-starter-test + ${spring-boot.version} + + + org.slf4j + slf4j-api + + + @@ -1271,7 +1515,7 @@ - install + validate enforce