refactor: moved provider library to a sub-project

wisdomfreak-1 · Mar 30, 2019 · 6a47d12 · 6a47d12
1 parent 843427f
commit 6a47d12
Show file tree

Hide file tree

Showing 69 changed files with 36 additions and 235 deletions.
diff --git 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
@@ -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
diff --git a/pact-jvm-provider/build.gradle b/pact-jvm-provider/build.gradle
diff --git a/provider/README.md b/provider/README.md
@@ -0,0 +1,2 @@
+Provider Pact-JVM Modules
+=========================
diff --git a/pact-jvm-provider/README.md → provider/pact-jvm-provider/README.md b/pact-jvm-provider/README.md → provider/pact-jvm-provider/README.md
diff --git a/provider/pact-jvm-provider/build.gradle 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/.../dius/pact/provider/ConsumersGroup.groovy → .../dius/pact/provider/ConsumersGroup.groovy b/.../dius/pact/provider/ConsumersGroup.groovy → .../dius/pact/provider/ConsumersGroup.groovy
diff --git a/...us/pact/provider/HttpClientFactory.groovy → ...us/pact/provider/HttpClientFactory.groovy b/...us/pact/provider/HttpClientFactory.groovy → ...us/pact/provider/HttpClientFactory.groovy
diff --git a/...om/dius/pact/provider/ProviderInfo.groovy → ...om/dius/pact/provider/ProviderInfo.groovy b/...om/dius/pact/provider/ProviderInfo.groovy → ...om/dius/pact/provider/ProviderInfo.groovy
diff --git a/...ius/pact/provider/ProviderVerifier.groovy → ...ius/pact/provider/ProviderVerifier.groovy b/...ius/pact/provider/ProviderVerifier.groovy → ...ius/pact/provider/ProviderVerifier.groovy
diff --git a/...ct/provider/reporters/JsonReporter.groovy → ...ct/provider/reporters/JsonReporter.groovy b/...ct/provider/reporters/JsonReporter.groovy → ...ct/provider/reporters/JsonReporter.groovy
diff --git a/...rovider/reporters/MarkdownReporter.groovy → ...rovider/reporters/MarkdownReporter.groovy b/...rovider/reporters/MarkdownReporter.groovy → ...rovider/reporters/MarkdownReporter.groovy
diff --git a/...provider/reporters/ReporterManager.groovy → ...provider/reporters/ReporterManager.groovy b/...provider/reporters/ReporterManager.groovy → ...provider/reporters/ReporterManager.groovy
diff --git a/...om/dius/pact/provider/junit/Consumer.java → ...om/dius/pact/provider/junit/Consumer.java b/...om/dius/pact/provider/junit/Consumer.java → ...om/dius/pact/provider/junit/Consumer.java
diff --git a/...vider/junit/MissingStateChangeMethod.java → ...vider/junit/MissingStateChangeMethod.java b/...vider/junit/MissingStateChangeMethod.java → ...vider/junit/MissingStateChangeMethod.java
diff --git a/...om/dius/pact/provider/junit/Provider.java → ...om/dius/pact/provider/junit/Provider.java b/...om/dius/pact/provider/junit/Provider.java → ...om/dius/pact/provider/junit/Provider.java
diff --git a/...u/com/dius/pact/provider/junit/State.java → ...u/com/dius/pact/provider/junit/State.java b/...u/com/dius/pact/provider/junit/State.java → ...u/com/dius/pact/provider/junit/State.java
diff --git a/...act/provider/junit/StateChangeAction.java → ...act/provider/junit/StateChangeAction.java b/...act/provider/junit/StateChangeAction.java → ...act/provider/junit/StateChangeAction.java
diff --git a/...t/provider/junit/TargetRequestFilter.java → ...t/provider/junit/TargetRequestFilter.java b/...t/provider/junit/TargetRequestFilter.java → ...t/provider/junit/TargetRequestFilter.java
diff --git a/...t/provider/junit/VerificationReports.java → ...t/provider/junit/VerificationReports.java b/...t/provider/junit/VerificationReports.java → ...t/provider/junit/VerificationReports.java
diff --git a/...r/junit/loader/NoPactsFoundException.java → ...r/junit/loader/NoPactsFoundException.java b/...r/junit/loader/NoPactsFoundException.java → ...r/junit/loader/NoPactsFoundException.java
diff --git a/...act/provider/junit/loader/PactBroker.java → ...act/provider/junit/loader/PactBroker.java b/...act/provider/junit/loader/PactBroker.java → ...act/provider/junit/loader/PactBroker.java
diff --git a/...provider/junit/loader/PactBrokerAuth.java → ...provider/junit/loader/PactBrokerAuth.java b/...provider/junit/loader/PactBrokerAuth.java → ...provider/junit/loader/PactBrokerAuth.java
diff --git a/...ovider/junit/loader/PactBrokerLoader.java → ...ovider/junit/loader/PactBrokerLoader.java b/...ovider/junit/loader/PactBrokerLoader.java → ...ovider/junit/loader/PactBrokerLoader.java
diff --git a/...act/provider/junit/loader/PactFilter.java → ...act/provider/junit/loader/PactFilter.java b/...act/provider/junit/loader/PactFilter.java → ...act/provider/junit/loader/PactFilter.java
diff --git a/...act/provider/junit/loader/PactFolder.java → ...act/provider/junit/loader/PactFolder.java b/...act/provider/junit/loader/PactFolder.java → ...act/provider/junit/loader/PactFolder.java
diff --git a/...act/provider/junit/loader/PactLoader.java → ...act/provider/junit/loader/PactLoader.java b/...act/provider/junit/loader/PactLoader.java → ...act/provider/junit/loader/PactLoader.java
diff --git a/...act/provider/junit/loader/PactSource.java → ...act/provider/junit/loader/PactSource.java b/...act/provider/junit/loader/PactSource.java → ...act/provider/junit/loader/PactSource.java
diff --git a/...s/pact/provider/junit/loader/PactUrl.java → ...s/pact/provider/junit/loader/PactUrl.java b/...s/pact/provider/junit/loader/PactUrl.java → ...s/pact/provider/junit/loader/PactUrl.java
diff --git a/.../provider/junit/loader/PactUrlLoader.java → .../provider/junit/loader/PactUrlLoader.java b/.../provider/junit/loader/PactUrlLoader.java → .../provider/junit/loader/PactUrlLoader.java
diff --git a/...ovider/junit/loader/VersionedPactUrl.java → ...ovider/junit/loader/VersionedPactUrl.java b/...ovider/junit/loader/VersionedPactUrl.java → ...ovider/junit/loader/VersionedPactUrl.java
diff --git a/.../junit/loader/VersionedPactUrlLoader.java → .../junit/loader/VersionedPactUrlLoader.java b/.../junit/loader/VersionedPactUrlLoader.java → .../junit/loader/VersionedPactUrlLoader.java
diff --git a/.../com/dius/pact/provider/ProviderClient.kt → .../com/dius/pact/provider/ProviderClient.kt b/.../com/dius/pact/provider/ProviderClient.kt → .../com/dius/pact/provider/ProviderClient.kt
diff --git a/...u/com/dius/pact/provider/ProviderUtils.kt → ...u/com/dius/pact/provider/ProviderUtils.kt b/...u/com/dius/pact/provider/ProviderUtils.kt → ...u/com/dius/pact/provider/ProviderUtils.kt
diff --git a/...om/dius/pact/provider/ProviderVerifier.kt → ...om/dius/pact/provider/ProviderVerifier.kt b/...om/dius/pact/provider/ProviderVerifier.kt → ...om/dius/pact/provider/ProviderVerifier.kt
diff --git a/.../dius/pact/provider/ResponseComparison.kt → .../dius/pact/provider/ResponseComparison.kt b/.../dius/pact/provider/ResponseComparison.kt → .../dius/pact/provider/ResponseComparison.kt
diff --git a/.../au/com/dius/pact/provider/StateChange.kt → .../au/com/dius/pact/provider/StateChange.kt b/.../au/com/dius/pact/provider/StateChange.kt → .../au/com/dius/pact/provider/StateChange.kt
diff --git a/...rovider/junit/JUnitProviderTestSupport.kt → ...rovider/junit/JUnitProviderTestSupport.kt b/...rovider/junit/JUnitProviderTestSupport.kt → ...rovider/junit/JUnitProviderTestSupport.kt
diff --git a/...provider/junit/loader/PactFolderLoader.kt → ...provider/junit/loader/PactFolderLoader.kt b/...provider/junit/loader/PactFolderLoader.kt → ...provider/junit/loader/PactFolderLoader.kt
diff --git a/...dius/pact/provider/junit/target/Target.kt → ...dius/pact/provider/junit/target/Target.kt b/...dius/pact/provider/junit/target/Target.kt → ...dius/pact/provider/junit/target/Target.kt
diff --git a/.../pact/provider/junit/target/TestTarget.kt → .../pact/provider/junit/target/TestTarget.kt b/.../pact/provider/junit/target/TestTarget.kt → .../pact/provider/junit/target/TestTarget.kt
diff --git a/...provider/reporters/AnsiConsoleReporter.kt → ...provider/reporters/AnsiConsoleReporter.kt b/...provider/reporters/AnsiConsoleReporter.kt → ...provider/reporters/AnsiConsoleReporter.kt
diff --git a/...ct/provider/reporters/VerifierReporter.kt → ...ct/provider/reporters/VerifierReporter.kt b/...ct/provider/reporters/VerifierReporter.kt → ...ct/provider/reporters/VerifierReporter.kt
diff --git a/.../dius/pact/provider/CollectionUtils.scala → .../dius/pact/provider/CollectionUtils.scala b/.../dius/pact/provider/CollectionUtils.scala → .../dius/pact/provider/CollectionUtils.scala
diff --git a/...ius/pact/provider/EnterStateRequest.scala → ...ius/pact/provider/EnterStateRequest.scala b/...ius/pact/provider/EnterStateRequest.scala → ...ius/pact/provider/EnterStateRequest.scala
diff --git a/...m/dius/pact/provider/PactFileSource.scala → ...m/dius/pact/provider/PactFileSource.scala b/...m/dius/pact/provider/PactFileSource.scala → ...m/dius/pact/provider/PactFileSource.scala
diff --git a/.../pact/provider/ServiceInvokeRequest.scala → .../pact/provider/ServiceInvokeRequest.scala b/.../pact/provider/ServiceInvokeRequest.scala → .../pact/provider/ServiceInvokeRequest.scala
diff --git a/...ius/pact/provider/ConsumerInfoSpec.groovy → ...ius/pact/provider/ConsumerInfoSpec.groovy b/...ius/pact/provider/ConsumerInfoSpec.groovy → ...ius/pact/provider/ConsumerInfoSpec.groovy
diff --git a/...ius/pact/provider/ProviderInfoSpec.groovy → ...ius/pact/provider/ProviderInfoSpec.groovy b/...ius/pact/provider/ProviderInfoSpec.groovy → ...ius/pact/provider/ProviderInfoSpec.groovy
diff --git a/...us/pact/provider/ProviderUtilsSpec.groovy → ...us/pact/provider/ProviderUtilsSpec.groovy b/...us/pact/provider/ProviderUtilsSpec.groovy → ...us/pact/provider/ProviderUtilsSpec.groovy
diff --git a/...pact/provider/ProviderVerifierSpec.groovy → ...pact/provider/ProviderVerifierSpec.groovy b/...pact/provider/ProviderVerifierSpec.groovy → ...pact/provider/ProviderVerifierSpec.groovy
diff --git a/...dius/pact/provider/StateChangeSpec.groovy → ...dius/pact/provider/StateChangeSpec.groovy b/...dius/pact/provider/StateChangeSpec.groovy → ...dius/pact/provider/StateChangeSpec.groovy
diff --git a/...er/broker/PactBrokerClientPactSpec.groovy → ...er/broker/PactBrokerClientPactSpec.groovy b/...er/broker/PactBrokerClientPactSpec.groovy → ...er/broker/PactBrokerClientPactSpec.groovy
diff --git a/...r/groovysupport/ProviderClientSpec.groovy → ...r/groovysupport/ProviderClientSpec.groovy b/...r/groovysupport/ProviderClientSpec.groovy → ...r/groovysupport/ProviderClientSpec.groovy
diff --git a/...r/groovysupport/ProviderClientTest.groovy → ...r/groovysupport/ProviderClientTest.groovy b/...r/groovysupport/ProviderClientTest.groovy → ...r/groovysupport/ProviderClientTest.groovy
diff --git a/...dmeExamplePactJVMProviderJUnitTest.groovy → ...dmeExamplePactJVMProviderJUnitTest.groovy b/...dmeExamplePactJVMProviderJUnitTest.groovy → ...dmeExamplePactJVMProviderJUnitTest.groovy
diff --git a/...dmeExamplePactJVMProviderSpockSpec.groovy → ...dmeExamplePactJVMProviderSpockSpec.groovy b/...dmeExamplePactJVMProviderSpockSpec.groovy → ...dmeExamplePactJVMProviderSpockSpec.groovy
diff --git a/...dropwizard/DropwizardConfiguration.groovy → ...dropwizard/DropwizardConfiguration.groovy b/...dropwizard/DropwizardConfiguration.groovy → ...dropwizard/DropwizardConfiguration.groovy
diff --git a/...opwizard/TestDropwizardApplication.groovy → ...opwizard/TestDropwizardApplication.groovy b/...opwizard/TestDropwizardApplication.groovy → ...opwizard/TestDropwizardApplication.groovy
diff --git a/...rovider/reporters/JsonReporterSpec.groovy → ...rovider/reporters/JsonReporterSpec.groovy b/...rovider/reporters/JsonReporterSpec.groovy → ...rovider/reporters/JsonReporterSpec.groovy
diff --git a/...der/reporters/MarkdownReporterSpec.groovy → ...der/reporters/MarkdownReporterSpec.groovy b/...der/reporters/MarkdownReporterSpec.groovy → ...der/reporters/MarkdownReporterSpec.groovy
diff --git a/...ider/reporters/ReporterManagerSpec.groovy → ...ider/reporters/ReporterManagerSpec.groovy b/...ider/reporters/ReporterManagerSpec.groovy → ...ider/reporters/ReporterManagerSpec.groovy
diff --git a/...ovider/groovysupport/GroovyJavaUtils.java → ...ovider/groovysupport/GroovyJavaUtils.java b/...ovider/groovysupport/GroovyJavaUtils.java → ...ovider/groovysupport/GroovyJavaUtils.java
diff --git a/...est/resources/dropwizard/test-config.yaml → ...est/resources/dropwizard/test-config.yaml b/...est/resources/dropwizard/test-config.yaml → ...est/resources/dropwizard/test-config.yaml
diff --git a/.../failingPacts/zoo_app-animal_service.json → .../failingPacts/zoo_app-animal_service.json b/.../failingPacts/zoo_app-animal_service.json → .../failingPacts/zoo_app-animal_service.json
diff --git a/...sources/pacts/zoo_app-animal_service.json → ...sources/pacts/zoo_app-animal_service.json b/...sources/pacts/zoo_app-animal_service.json → ...sources/pacts/zoo_app-animal_service.json
diff --git a/...dius/pact/provider/GroovyScalaUtils.scala → ...dius/pact/provider/GroovyScalaUtils.scala b/...dius/pact/provider/GroovyScalaUtils.scala → ...dius/pact/provider/GroovyScalaUtils.scala
diff --git 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'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Provider Pact-JVM Modules
		=========================