From 6a47d12c8e13cf251f92eca079e2422a45695fe3 Mon Sep 17 00:00:00 2001 From: Ronald Holshausen Date: Sun, 31 Mar 2019 10:48:02 +1100 Subject: [PATCH] refactor: moved provider library to a sub-project --- .gitignore | 11 +- build.gradle | 4 + pact-jvm-provider/LICENSE | 202 ------------------ pact-jvm-provider/build.gradle | 30 --- provider/README.md | 2 + .../pact-jvm-provider}/README.md | 0 provider/pact-jvm-provider/build.gradle | 20 ++ .../dius/pact/provider/ConsumersGroup.groovy | 0 .../pact/provider/HttpClientFactory.groovy | 0 .../dius/pact/provider/ProviderInfo.groovy | 0 .../pact/provider/ProviderVerifier.groovy | 0 .../provider/reporters/JsonReporter.groovy | 0 .../reporters/MarkdownReporter.groovy | 0 .../provider/reporters/ReporterManager.groovy | 0 .../dius/pact/provider/junit/Consumer.java | 0 .../junit/MissingStateChangeMethod.java | 0 .../dius/pact/provider/junit/Provider.java | 0 .../com/dius/pact/provider/junit/State.java | 0 .../provider/junit/StateChangeAction.java | 0 .../provider/junit/TargetRequestFilter.java | 0 .../provider/junit/VerificationReports.java | 0 .../junit/loader/NoPactsFoundException.java | 0 .../provider/junit/loader/PactBroker.java | 0 .../provider/junit/loader/PactBrokerAuth.java | 0 .../junit/loader/PactBrokerLoader.java | 0 .../provider/junit/loader/PactFilter.java | 0 .../provider/junit/loader/PactFolder.java | 0 .../provider/junit/loader/PactLoader.java | 0 .../provider/junit/loader/PactSource.java | 0 .../pact/provider/junit/loader/PactUrl.java | 0 .../provider/junit/loader/PactUrlLoader.java | 0 .../junit/loader/VersionedPactUrl.java | 0 .../junit/loader/VersionedPactUrlLoader.java | 0 .../com/dius/pact/provider/ProviderClient.kt | 0 .../com/dius/pact/provider/ProviderUtils.kt | 0 .../dius/pact/provider/ProviderVerifier.kt | 0 .../dius/pact/provider/ResponseComparison.kt | 0 .../au/com/dius/pact/provider/StateChange.kt | 0 .../junit/JUnitProviderTestSupport.kt | 0 .../provider/junit/loader/PactFolderLoader.kt | 0 .../dius/pact/provider/junit/target/Target.kt | 0 .../pact/provider/junit/target/TestTarget.kt | 0 .../provider/reporters/AnsiConsoleReporter.kt | 0 .../provider/reporters/VerifierReporter.kt | 0 .../dius/pact/provider/CollectionUtils.scala | 0 .../pact/provider/EnterStateRequest.scala | 0 .../dius/pact/provider/PactFileSource.scala | 0 .../pact/provider/ServiceInvokeRequest.scala | 0 .../pact/provider/ConsumerInfoSpec.groovy | 0 .../pact/provider/ProviderInfoSpec.groovy | 0 .../pact/provider/ProviderUtilsSpec.groovy | 0 .../pact/provider/ProviderVerifierSpec.groovy | 0 .../dius/pact/provider/StateChangeSpec.groovy | 0 .../broker/PactBrokerClientPactSpec.groovy | 0 .../groovysupport/ProviderClientSpec.groovy | 0 .../groovysupport/ProviderClientTest.groovy | 0 ...admeExamplePactJVMProviderJUnitTest.groovy | 0 ...admeExamplePactJVMProviderSpockSpec.groovy | 0 .../dropwizard/DropwizardConfiguration.groovy | 0 .../TestDropwizardApplication.groovy | 0 .../reporters/JsonReporterSpec.groovy | 0 .../reporters/MarkdownReporterSpec.groovy | 0 .../reporters/ReporterManagerSpec.groovy | 0 .../groovysupport/GroovyJavaUtils.java | 0 .../resources/dropwizard/test-config.yaml | 0 .../failingPacts/zoo_app-animal_service.json | 0 .../pacts/zoo_app-animal_service.json | 0 .../dius/pact/provider/GroovyScalaUtils.scala | 0 settings.gradle | 2 + 69 files changed, 36 insertions(+), 235 deletions(-) delete mode 100644 pact-jvm-provider/LICENSE delete mode 100644 pact-jvm-provider/build.gradle create mode 100644 provider/README.md rename {pact-jvm-provider => provider/pact-jvm-provider}/README.md (100%) create mode 100644 provider/pact-jvm-provider/build.gradle rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/groovy/au/com/dius/pact/provider/ConsumersGroup.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/groovy/au/com/dius/pact/provider/HttpClientFactory.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/groovy/au/com/dius/pact/provider/ProviderInfo.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/groovy/au/com/dius/pact/provider/ProviderVerifier.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/groovy/au/com/dius/pact/provider/reporters/JsonReporter.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/groovy/au/com/dius/pact/provider/reporters/MarkdownReporter.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/groovy/au/com/dius/pact/provider/reporters/ReporterManager.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/java/au/com/dius/pact/provider/junit/Consumer.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/java/au/com/dius/pact/provider/junit/MissingStateChangeMethod.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/java/au/com/dius/pact/provider/junit/Provider.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/java/au/com/dius/pact/provider/junit/State.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/java/au/com/dius/pact/provider/junit/StateChangeAction.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/java/au/com/dius/pact/provider/junit/TargetRequestFilter.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/java/au/com/dius/pact/provider/junit/VerificationReports.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/java/au/com/dius/pact/provider/junit/loader/NoPactsFoundException.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/java/au/com/dius/pact/provider/junit/loader/PactBroker.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/java/au/com/dius/pact/provider/junit/loader/PactBrokerAuth.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/java/au/com/dius/pact/provider/junit/loader/PactBrokerLoader.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/java/au/com/dius/pact/provider/junit/loader/PactFilter.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/java/au/com/dius/pact/provider/junit/loader/PactFolder.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/java/au/com/dius/pact/provider/junit/loader/PactLoader.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/java/au/com/dius/pact/provider/junit/loader/PactSource.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/java/au/com/dius/pact/provider/junit/loader/PactUrl.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/java/au/com/dius/pact/provider/junit/loader/PactUrlLoader.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/java/au/com/dius/pact/provider/junit/loader/VersionedPactUrl.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/java/au/com/dius/pact/provider/junit/loader/VersionedPactUrlLoader.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/kotlin/au/com/dius/pact/provider/ProviderClient.kt (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/kotlin/au/com/dius/pact/provider/ProviderUtils.kt (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/kotlin/au/com/dius/pact/provider/ProviderVerifier.kt (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/kotlin/au/com/dius/pact/provider/ResponseComparison.kt (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/kotlin/au/com/dius/pact/provider/StateChange.kt (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/kotlin/au/com/dius/pact/provider/junit/JUnitProviderTestSupport.kt (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/kotlin/au/com/dius/pact/provider/junit/loader/PactFolderLoader.kt (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/kotlin/au/com/dius/pact/provider/junit/target/Target.kt (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/kotlin/au/com/dius/pact/provider/junit/target/TestTarget.kt (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/kotlin/au/com/dius/pact/provider/reporters/AnsiConsoleReporter.kt (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/kotlin/au/com/dius/pact/provider/reporters/VerifierReporter.kt (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/scala/au/com/dius/pact/provider/CollectionUtils.scala (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/scala/au/com/dius/pact/provider/EnterStateRequest.scala (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/scala/au/com/dius/pact/provider/PactFileSource.scala (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/main/scala/au/com/dius/pact/provider/ServiceInvokeRequest.scala (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/groovy/au/com/dius/pact/provider/ConsumerInfoSpec.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/groovy/au/com/dius/pact/provider/ProviderInfoSpec.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/groovy/au/com/dius/pact/provider/ProviderUtilsSpec.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/groovy/au/com/dius/pact/provider/ProviderVerifierSpec.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/groovy/au/com/dius/pact/provider/StateChangeSpec.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/groovy/au/com/dius/pact/provider/broker/PactBrokerClientPactSpec.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/groovy/au/com/dius/pact/provider/groovysupport/ProviderClientSpec.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/groovy/au/com/dius/pact/provider/groovysupport/ProviderClientTest.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/groovy/au/com/dius/pact/provider/readme/ReadmeExamplePactJVMProviderJUnitTest.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/groovy/au/com/dius/pact/provider/readme/ReadmeExamplePactJVMProviderSpockSpec.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/groovy/au/com/dius/pact/provider/readme/dropwizard/DropwizardConfiguration.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/groovy/au/com/dius/pact/provider/readme/dropwizard/TestDropwizardApplication.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/groovy/au/com/dius/pact/provider/reporters/JsonReporterSpec.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/groovy/au/com/dius/pact/provider/reporters/MarkdownReporterSpec.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/groovy/au/com/dius/pact/provider/reporters/ReporterManagerSpec.groovy (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/java/au/com/dius/pact/provider/groovysupport/GroovyJavaUtils.java (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/resources/dropwizard/test-config.yaml (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/resources/failingPacts/zoo_app-animal_service.json (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/resources/pacts/zoo_app-animal_service.json (100%) rename {pact-jvm-provider => provider/pact-jvm-provider}/src/test/scala/au/com/dius/pact/provider/GroovyScalaUtils.scala (100%) diff --git a/.gitignore b/.gitignore index 81ab1f956b..08fd2d630c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,6 @@ */bin # sbt specific dist/* -/target/ -/*/target/ lib_managed/ src_managed/ project/boot/ @@ -33,4 +31,11 @@ pkgdiff_reports/ .gradle/ out/ - +consumer/pact-jvm-consumer/target/ +pact-jvm-consumer-groovy/target/ +pact-jvm-consumer-junit/target/ +pact-jvm-consumer-junit5/target/ +pact-jvm-consumer-specs2/target/ +pact-jvm-provider-scalasupport/target/ +pact-jvm-provider-specs2/target/ +provider/pact-jvm-provider/target/ diff --git a/build.gradle b/build.gradle index 446326a26a..7eaea6a49d 100644 --- a/build.gradle +++ b/build.gradle @@ -55,6 +55,10 @@ allprojects { } subprojects { + + if (name in ['core', 'consumer', 'provider']) { + return + } buildscript { repositories { diff --git a/pact-jvm-provider/LICENSE b/pact-jvm-provider/LICENSE deleted file mode 100644 index e06d208186..0000000000 --- a/pact-jvm-provider/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ -Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - diff --git a/pact-jvm-provider/build.gradle b/pact-jvm-provider/build.gradle deleted file mode 100644 index 1aa193a9a6..0000000000 --- a/pact-jvm-provider/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -dependencies { - compile project(":core:pact-jvm-core-model"), project(":core:pact-jvm-core-pact-broker"), - project(":core:pact-jvm-core-matchers"), - 'commons-io:commons-io:2.5', - "org.fusesource.jansi:jansi:${project.jansiVersion}", - "org.apache.httpcomponents:httpclient:${project.httpClientVersion}", - 'org.reflections:reflections:0.9.11' - compile 'org.scala-lang.modules:scala-java8-compat_2.12:0.9.0' - implementation 'org.slf4j:slf4j-api:1.7.26' - - testCompile project(":pact-jvm-consumer-groovy") - testCompile "ch.qos.logback:logback-classic:${project.logbackVersion}" - testCompile 'io.dropwizard:dropwizard-testing:1.3.7' -} - -compileGroovy { - classpath = classpath.plus(files(compileKotlin.destinationDir)) - dependsOn compileKotlin -} - -compileTestGroovy { - dependsOn compileTestScala - classpath = classpath.plus(files(compileTestScala.destinationDir)) -} - -compileKotlin { - kotlinOptions { - apiVersion = "1.1" - } -} diff --git a/provider/README.md b/provider/README.md new file mode 100644 index 0000000000..54f3a2c136 --- /dev/null +++ b/provider/README.md @@ -0,0 +1,2 @@ +Provider Pact-JVM Modules +========================= diff --git a/pact-jvm-provider/README.md b/provider/pact-jvm-provider/README.md similarity index 100% rename from pact-jvm-provider/README.md rename to provider/pact-jvm-provider/README.md diff --git a/provider/pact-jvm-provider/build.gradle b/provider/pact-jvm-provider/build.gradle new file mode 100644 index 0000000000..d4a84bca27 --- /dev/null +++ b/provider/pact-jvm-provider/build.gradle @@ -0,0 +1,20 @@ +dependencies { + compile project(":core:pact-jvm-core-model"), + project(":core:pact-jvm-core-pact-broker"), + project(":core:pact-jvm-core-matchers"), + 'commons-io:commons-io:2.5', + "org.fusesource.jansi:jansi:${project.jansiVersion}", + "org.apache.httpcomponents:httpclient:${project.httpClientVersion}", + 'org.reflections:reflections:0.9.11' + implementation 'org.slf4j:slf4j-api:1.7.26' + implementation 'org.scala-lang:scala-library:2.12.8' + + testCompile project("consumer:pact-jvm-consumer-groovy") + testCompile "ch.qos.logback:logback-classic:${project.logbackVersion}" + testCompile 'io.dropwizard:dropwizard-testing:1.3.7' +} + +compileGroovy { + classpath = classpath.plus(files(compileKotlin.destinationDir)) + dependsOn compileKotlin +} diff --git a/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/ConsumersGroup.groovy b/provider/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/ConsumersGroup.groovy similarity index 100% rename from pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/ConsumersGroup.groovy rename to provider/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/ConsumersGroup.groovy diff --git a/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/HttpClientFactory.groovy b/provider/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/HttpClientFactory.groovy similarity index 100% rename from pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/HttpClientFactory.groovy rename to provider/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/HttpClientFactory.groovy diff --git a/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/ProviderInfo.groovy b/provider/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/ProviderInfo.groovy similarity index 100% rename from pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/ProviderInfo.groovy rename to provider/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/ProviderInfo.groovy diff --git a/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/ProviderVerifier.groovy b/provider/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/ProviderVerifier.groovy similarity index 100% rename from pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/ProviderVerifier.groovy rename to provider/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/ProviderVerifier.groovy diff --git a/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/reporters/JsonReporter.groovy b/provider/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/reporters/JsonReporter.groovy similarity index 100% rename from pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/reporters/JsonReporter.groovy rename to provider/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/reporters/JsonReporter.groovy diff --git a/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/reporters/MarkdownReporter.groovy b/provider/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/reporters/MarkdownReporter.groovy similarity index 100% rename from pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/reporters/MarkdownReporter.groovy rename to provider/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/reporters/MarkdownReporter.groovy diff --git a/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/reporters/ReporterManager.groovy b/provider/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/reporters/ReporterManager.groovy similarity index 100% rename from pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/reporters/ReporterManager.groovy rename to provider/pact-jvm-provider/src/main/groovy/au/com/dius/pact/provider/reporters/ReporterManager.groovy diff --git a/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/Consumer.java b/provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/Consumer.java similarity index 100% rename from pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/Consumer.java rename to provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/Consumer.java diff --git a/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/MissingStateChangeMethod.java b/provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/MissingStateChangeMethod.java similarity index 100% rename from pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/MissingStateChangeMethod.java rename to provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/MissingStateChangeMethod.java diff --git a/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/Provider.java b/provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/Provider.java similarity index 100% rename from pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/Provider.java rename to provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/Provider.java diff --git a/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/State.java b/provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/State.java similarity index 100% rename from pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/State.java rename to provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/State.java diff --git a/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/StateChangeAction.java b/provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/StateChangeAction.java similarity index 100% rename from pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/StateChangeAction.java rename to provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/StateChangeAction.java diff --git a/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/TargetRequestFilter.java b/provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/TargetRequestFilter.java similarity index 100% rename from pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/TargetRequestFilter.java rename to provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/TargetRequestFilter.java diff --git a/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/VerificationReports.java b/provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/VerificationReports.java similarity index 100% rename from pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/VerificationReports.java rename to provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/VerificationReports.java diff --git a/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/NoPactsFoundException.java b/provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/NoPactsFoundException.java similarity index 100% rename from pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/NoPactsFoundException.java rename to provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/NoPactsFoundException.java diff --git a/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactBroker.java b/provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactBroker.java similarity index 100% rename from pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactBroker.java rename to provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactBroker.java diff --git a/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactBrokerAuth.java b/provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactBrokerAuth.java similarity index 100% rename from pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactBrokerAuth.java rename to provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactBrokerAuth.java diff --git a/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactBrokerLoader.java b/provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactBrokerLoader.java similarity index 100% rename from pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactBrokerLoader.java rename to provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactBrokerLoader.java diff --git a/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactFilter.java b/provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactFilter.java similarity index 100% rename from pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactFilter.java rename to provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactFilter.java diff --git a/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactFolder.java b/provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactFolder.java similarity index 100% rename from pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactFolder.java rename to provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactFolder.java diff --git a/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactLoader.java b/provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactLoader.java similarity index 100% rename from pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactLoader.java rename to provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactLoader.java diff --git a/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactSource.java b/provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactSource.java similarity index 100% rename from pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactSource.java rename to provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactSource.java diff --git a/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactUrl.java b/provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactUrl.java similarity index 100% rename from pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactUrl.java rename to provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactUrl.java diff --git a/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactUrlLoader.java b/provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactUrlLoader.java similarity index 100% rename from pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactUrlLoader.java rename to provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/PactUrlLoader.java diff --git a/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/VersionedPactUrl.java b/provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/VersionedPactUrl.java similarity index 100% rename from pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/VersionedPactUrl.java rename to provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/VersionedPactUrl.java diff --git a/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/VersionedPactUrlLoader.java b/provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/VersionedPactUrlLoader.java similarity index 100% rename from pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/VersionedPactUrlLoader.java rename to provider/pact-jvm-provider/src/main/java/au/com/dius/pact/provider/junit/loader/VersionedPactUrlLoader.java diff --git a/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/ProviderClient.kt b/provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/ProviderClient.kt similarity index 100% rename from pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/ProviderClient.kt rename to provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/ProviderClient.kt diff --git a/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/ProviderUtils.kt b/provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/ProviderUtils.kt similarity index 100% rename from pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/ProviderUtils.kt rename to provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/ProviderUtils.kt diff --git a/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/ProviderVerifier.kt b/provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/ProviderVerifier.kt similarity index 100% rename from pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/ProviderVerifier.kt rename to provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/ProviderVerifier.kt diff --git a/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/ResponseComparison.kt b/provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/ResponseComparison.kt similarity index 100% rename from pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/ResponseComparison.kt rename to provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/ResponseComparison.kt diff --git a/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/StateChange.kt b/provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/StateChange.kt similarity index 100% rename from pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/StateChange.kt rename to provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/StateChange.kt diff --git a/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/junit/JUnitProviderTestSupport.kt b/provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/junit/JUnitProviderTestSupport.kt similarity index 100% rename from pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/junit/JUnitProviderTestSupport.kt rename to provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/junit/JUnitProviderTestSupport.kt diff --git a/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/junit/loader/PactFolderLoader.kt b/provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/junit/loader/PactFolderLoader.kt similarity index 100% rename from pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/junit/loader/PactFolderLoader.kt rename to provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/junit/loader/PactFolderLoader.kt diff --git a/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/junit/target/Target.kt b/provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/junit/target/Target.kt similarity index 100% rename from pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/junit/target/Target.kt rename to provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/junit/target/Target.kt diff --git a/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/junit/target/TestTarget.kt b/provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/junit/target/TestTarget.kt similarity index 100% rename from pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/junit/target/TestTarget.kt rename to provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/junit/target/TestTarget.kt diff --git a/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/reporters/AnsiConsoleReporter.kt b/provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/reporters/AnsiConsoleReporter.kt similarity index 100% rename from pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/reporters/AnsiConsoleReporter.kt rename to provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/reporters/AnsiConsoleReporter.kt diff --git a/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/reporters/VerifierReporter.kt b/provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/reporters/VerifierReporter.kt similarity index 100% rename from pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/reporters/VerifierReporter.kt rename to provider/pact-jvm-provider/src/main/kotlin/au/com/dius/pact/provider/reporters/VerifierReporter.kt diff --git a/pact-jvm-provider/src/main/scala/au/com/dius/pact/provider/CollectionUtils.scala b/provider/pact-jvm-provider/src/main/scala/au/com/dius/pact/provider/CollectionUtils.scala similarity index 100% rename from pact-jvm-provider/src/main/scala/au/com/dius/pact/provider/CollectionUtils.scala rename to provider/pact-jvm-provider/src/main/scala/au/com/dius/pact/provider/CollectionUtils.scala diff --git a/pact-jvm-provider/src/main/scala/au/com/dius/pact/provider/EnterStateRequest.scala b/provider/pact-jvm-provider/src/main/scala/au/com/dius/pact/provider/EnterStateRequest.scala similarity index 100% rename from pact-jvm-provider/src/main/scala/au/com/dius/pact/provider/EnterStateRequest.scala rename to provider/pact-jvm-provider/src/main/scala/au/com/dius/pact/provider/EnterStateRequest.scala diff --git a/pact-jvm-provider/src/main/scala/au/com/dius/pact/provider/PactFileSource.scala b/provider/pact-jvm-provider/src/main/scala/au/com/dius/pact/provider/PactFileSource.scala similarity index 100% rename from pact-jvm-provider/src/main/scala/au/com/dius/pact/provider/PactFileSource.scala rename to provider/pact-jvm-provider/src/main/scala/au/com/dius/pact/provider/PactFileSource.scala diff --git a/pact-jvm-provider/src/main/scala/au/com/dius/pact/provider/ServiceInvokeRequest.scala b/provider/pact-jvm-provider/src/main/scala/au/com/dius/pact/provider/ServiceInvokeRequest.scala similarity index 100% rename from pact-jvm-provider/src/main/scala/au/com/dius/pact/provider/ServiceInvokeRequest.scala rename to provider/pact-jvm-provider/src/main/scala/au/com/dius/pact/provider/ServiceInvokeRequest.scala diff --git a/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/ConsumerInfoSpec.groovy b/provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/ConsumerInfoSpec.groovy similarity index 100% rename from pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/ConsumerInfoSpec.groovy rename to provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/ConsumerInfoSpec.groovy diff --git a/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/ProviderInfoSpec.groovy b/provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/ProviderInfoSpec.groovy similarity index 100% rename from pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/ProviderInfoSpec.groovy rename to provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/ProviderInfoSpec.groovy diff --git a/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/ProviderUtilsSpec.groovy b/provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/ProviderUtilsSpec.groovy similarity index 100% rename from pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/ProviderUtilsSpec.groovy rename to provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/ProviderUtilsSpec.groovy diff --git a/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/ProviderVerifierSpec.groovy b/provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/ProviderVerifierSpec.groovy similarity index 100% rename from pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/ProviderVerifierSpec.groovy rename to provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/ProviderVerifierSpec.groovy diff --git a/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/StateChangeSpec.groovy b/provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/StateChangeSpec.groovy similarity index 100% rename from pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/StateChangeSpec.groovy rename to provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/StateChangeSpec.groovy diff --git a/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/broker/PactBrokerClientPactSpec.groovy b/provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/broker/PactBrokerClientPactSpec.groovy similarity index 100% rename from pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/broker/PactBrokerClientPactSpec.groovy rename to provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/broker/PactBrokerClientPactSpec.groovy diff --git a/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/groovysupport/ProviderClientSpec.groovy b/provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/groovysupport/ProviderClientSpec.groovy similarity index 100% rename from pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/groovysupport/ProviderClientSpec.groovy rename to provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/groovysupport/ProviderClientSpec.groovy diff --git a/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/groovysupport/ProviderClientTest.groovy b/provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/groovysupport/ProviderClientTest.groovy similarity index 100% rename from pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/groovysupport/ProviderClientTest.groovy rename to provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/groovysupport/ProviderClientTest.groovy diff --git a/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/readme/ReadmeExamplePactJVMProviderJUnitTest.groovy b/provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/readme/ReadmeExamplePactJVMProviderJUnitTest.groovy similarity index 100% rename from pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/readme/ReadmeExamplePactJVMProviderJUnitTest.groovy rename to provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/readme/ReadmeExamplePactJVMProviderJUnitTest.groovy diff --git a/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/readme/ReadmeExamplePactJVMProviderSpockSpec.groovy b/provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/readme/ReadmeExamplePactJVMProviderSpockSpec.groovy similarity index 100% rename from pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/readme/ReadmeExamplePactJVMProviderSpockSpec.groovy rename to provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/readme/ReadmeExamplePactJVMProviderSpockSpec.groovy diff --git a/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/readme/dropwizard/DropwizardConfiguration.groovy b/provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/readme/dropwizard/DropwizardConfiguration.groovy similarity index 100% rename from pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/readme/dropwizard/DropwizardConfiguration.groovy rename to provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/readme/dropwizard/DropwizardConfiguration.groovy diff --git a/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/readme/dropwizard/TestDropwizardApplication.groovy b/provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/readme/dropwizard/TestDropwizardApplication.groovy similarity index 100% rename from pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/readme/dropwizard/TestDropwizardApplication.groovy rename to provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/readme/dropwizard/TestDropwizardApplication.groovy diff --git a/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/reporters/JsonReporterSpec.groovy b/provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/reporters/JsonReporterSpec.groovy similarity index 100% rename from pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/reporters/JsonReporterSpec.groovy rename to provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/reporters/JsonReporterSpec.groovy diff --git a/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/reporters/MarkdownReporterSpec.groovy b/provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/reporters/MarkdownReporterSpec.groovy similarity index 100% rename from pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/reporters/MarkdownReporterSpec.groovy rename to provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/reporters/MarkdownReporterSpec.groovy diff --git a/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/reporters/ReporterManagerSpec.groovy b/provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/reporters/ReporterManagerSpec.groovy similarity index 100% rename from pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/reporters/ReporterManagerSpec.groovy rename to provider/pact-jvm-provider/src/test/groovy/au/com/dius/pact/provider/reporters/ReporterManagerSpec.groovy diff --git a/pact-jvm-provider/src/test/java/au/com/dius/pact/provider/groovysupport/GroovyJavaUtils.java b/provider/pact-jvm-provider/src/test/java/au/com/dius/pact/provider/groovysupport/GroovyJavaUtils.java similarity index 100% rename from pact-jvm-provider/src/test/java/au/com/dius/pact/provider/groovysupport/GroovyJavaUtils.java rename to provider/pact-jvm-provider/src/test/java/au/com/dius/pact/provider/groovysupport/GroovyJavaUtils.java diff --git a/pact-jvm-provider/src/test/resources/dropwizard/test-config.yaml b/provider/pact-jvm-provider/src/test/resources/dropwizard/test-config.yaml similarity index 100% rename from pact-jvm-provider/src/test/resources/dropwizard/test-config.yaml rename to provider/pact-jvm-provider/src/test/resources/dropwizard/test-config.yaml diff --git a/pact-jvm-provider/src/test/resources/failingPacts/zoo_app-animal_service.json b/provider/pact-jvm-provider/src/test/resources/failingPacts/zoo_app-animal_service.json similarity index 100% rename from pact-jvm-provider/src/test/resources/failingPacts/zoo_app-animal_service.json rename to provider/pact-jvm-provider/src/test/resources/failingPacts/zoo_app-animal_service.json diff --git a/pact-jvm-provider/src/test/resources/pacts/zoo_app-animal_service.json b/provider/pact-jvm-provider/src/test/resources/pacts/zoo_app-animal_service.json similarity index 100% rename from pact-jvm-provider/src/test/resources/pacts/zoo_app-animal_service.json rename to provider/pact-jvm-provider/src/test/resources/pacts/zoo_app-animal_service.json diff --git a/pact-jvm-provider/src/test/scala/au/com/dius/pact/provider/GroovyScalaUtils.scala b/provider/pact-jvm-provider/src/test/scala/au/com/dius/pact/provider/GroovyScalaUtils.scala similarity index 100% rename from pact-jvm-provider/src/test/scala/au/com/dius/pact/provider/GroovyScalaUtils.scala rename to provider/pact-jvm-provider/src/test/scala/au/com/dius/pact/provider/GroovyScalaUtils.scala diff --git a/settings.gradle b/settings.gradle index ceec73525f..f172dc77b5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -13,6 +13,8 @@ project(':core:pact-jvm-core-matchers').projectDir = file('core/matchers') include 'consumer:pact-jvm-consumer' +include 'provider:pact-jvm-provider' + //include 'pact-jvm-consumer-junit' //include 'pact-jvm-consumer-junit5' //include 'pact-jvm-consumer-java8'