From 3232adefe621e5a401b7704cbb63e349ac2e16bb Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 25 Apr 2016 15:43:42 +0200 Subject: [PATCH] Updated Groovy version, changed StubTrigger name --- docs/src/docs/asciidoc/migration.adoc | 4 ++-- docs/src/docs/asciidoc/stubrunner_msg.adoc | 2 +- stub-runner/stub-runner/build.gradle | 2 +- .../groovy/io/codearte/accurest/stubrunner/StubFinder.groovy | 2 +- .../stubrunner/{StubTriggerer.groovy => StubTrigger.groovy} | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/{StubTriggerer.groovy => StubTrigger.groovy} (94%) diff --git a/docs/src/docs/asciidoc/migration.adoc b/docs/src/docs/asciidoc/migration.adoc index 8ddc214619..98e1215e9a 100644 --- a/docs/src/docs/asciidoc/migration.adoc +++ b/docs/src/docs/asciidoc/migration.adoc @@ -13,8 +13,8 @@ - now all DSL files have to be under `contractsDslDir`/*subpackage* resulting in `basePackageForTests`.*subpackage* test package creation - If you don't migrate to the new approach you will have your tests under `contractsDslDir`.`contractsDslDir`.*subpackage* -=== Migration to 1.0.7 -- from 1.0.7 we're setting JUnit as a default testing utility. You have to pass the following option to keep Spock +=== Migration to {messaging_version} +- from {messaging_version} we're setting JUnit as a default testing utility. You have to pass the following option to keep Spock as your first choice: [source,groovy] diff --git a/docs/src/docs/asciidoc/stubrunner_msg.adoc b/docs/src/docs/asciidoc/stubrunner_msg.adoc index 76bf5c241e..4b383c095e 100644 --- a/docs/src/docs/asciidoc/stubrunner_msg.adoc +++ b/docs/src/docs/asciidoc/stubrunner_msg.adoc @@ -16,7 +16,7 @@ To trigger a message it's enough to use the `StubTiggerer` interface: [source,groovy] ---- -include::../../../../stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubTriggerer.groovy[] +include::../../../../stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubTrigger.groovy[] ---- For convenience the `StubFinder` interface extends `StubTrigger` so it's enough to use only one in your tests. diff --git a/stub-runner/stub-runner/build.gradle b/stub-runner/stub-runner/build.gradle index c6e992b79a..158628c06b 100644 --- a/stub-runner/stub-runner/build.gradle +++ b/stub-runner/stub-runner/build.gradle @@ -7,7 +7,7 @@ dependencies { compile project(':accurest-core') compile project(':accurest-messaging-root:accurest-messaging-core') compile 'org.apache.ivy:ivy:2.4.0' - compile localGroovy() + compile 'org.codehaus.groovy:groovy-all:2.4.4' compile "com.github.tomakehurst:wiremock:$wiremockVersion" compile 'javax.servlet:javax.servlet-api:3.1.0' compile 'args4j:args4j:2.32' diff --git a/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubFinder.groovy b/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubFinder.groovy index 9c14c75735..f69f88044c 100644 --- a/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubFinder.groovy +++ b/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubFinder.groovy @@ -2,7 +2,7 @@ package io.codearte.accurest.stubrunner import io.codearte.accurest.dsl.GroovyDsl -interface StubFinder extends StubTriggerer { +interface StubFinder extends StubTrigger { /** * For the given groupId and artifactId tries to find the matching * URL of the running stub. diff --git a/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubTriggerer.groovy b/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubTrigger.groovy similarity index 94% rename from stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubTriggerer.groovy rename to stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubTrigger.groovy index 99090b8bdc..94b900bc6d 100644 --- a/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubTriggerer.groovy +++ b/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubTrigger.groovy @@ -1,6 +1,6 @@ package io.codearte.accurest.stubrunner -interface StubTriggerer { +interface StubTrigger { /** * Triggers an event by a given label for a given {@code groupid:artifactid} notation. You can use only {@code artifactId} too.