From ff48c5dbdaadee9e8a147c13a58a33ecf98ba408 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 12 Jul 2016 13:57:57 +0100 Subject: [PATCH] Add dependencies BOM Updates to groovy 2.4.7 which makes static compilation stricter (hence the code changes). Fixes gh-8 --- pom.xml | 298 +--------------- .../.factorypath | 167 +++++++++ spring-cloud-contract-dependencies/pom.xml | 335 ++++++++++++++++++ .../contract/stubrunner/StubRepository.groovy | 4 +- .../stubrunner/StubRunnerExecutor.groovy | 2 +- .../stubrunner/StubRunnerFactory.groovy | 2 +- .../StubRunnerOptionsBuilder.groovy | 2 +- 7 files changed, 518 insertions(+), 292 deletions(-) create mode 100644 spring-cloud-contract-dependencies/.factorypath create mode 100644 spring-cloud-contract-dependencies/pom.xml diff --git a/pom.xml b/pom.xml index 682a7f7c20..47c188a78b 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,13 @@ 2016 + + 2.17.0 + 1.0.2.RELEASE + + + spring-cloud-contract-dependencies docs spring-cloud-contract-verifier spring-cloud-contract-spec @@ -32,301 +38,19 @@ samples - - 2.1.7 - 0.4.7 - 2.17.0 - 1.1.0 - 4.3.1.RELEASE - 1.4.0.BUILD-SNAPSHOT - 1.2.0.BUILD-SNAPSHOT - 1.0.2.RELEASE - 1.0.2.RELEASE - 9.2.13.v20150730 - - - - org.springframework.cloud.contract - spring-cloud-contract-spec - ${project.version} - - - org.springframework.cloud.contract - spring-cloud-contract-verifier-core - ${project.version} - - - org.springframework.cloud.contract - spring-cloud-contract-verifier-testing-utils - ${project.version} - - - org.springframework.cloud.contract - spring-cloud-contract-stub-runner - ${project.version} - - - org.springframework.cloud.contract - spring-cloud-contract-stub-runner-spring - ${project.version} - - - org.springframework.cloud.contract - spring-cloud-contract-stub-runner-boot - ${project.version} - - - org.springframework.cloud.contract - spring-cloud-contract-verifier-messaging-core - ${project.version} - - - org.springframework.cloud.contract - spring-cloud-contract-verifier-camel - ${project.version} - - - org.springframework.cloud.contract - spring-cloud-contract-verifier-integration - ${project.version} - - - org.springframework.cloud.contract - spring-cloud-contract-verifier-stream - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-ribbon - ${spring-cloud-netflix.version} - - - org.springframework.cloud - spring-cloud-starter-eureka - ${spring-cloud-netflix.version} - - - org.springframework.cloud - spring-cloud-starter-zookeeper-discovery - ${spring-cloud-zookeeper.version} - - - org.springframework.cloud - spring-cloud-stream - ${spring-cloud-stream.version} - - - org.springframework.cloud - spring-cloud-stream-test-support - ${spring-cloud-stream.version} - cglib cglib 3.2.4 - org.apache.curator - curator-test - 2.9.1 - - - com.google.guava - guava - - - - - commons-io - commons-io - 2.0 - - - org.apache.commons - commons-lang3 - 3.3 - - - com.github.tomakehurst - wiremock - ${wiremock.version} - - - org.eclipse.jetty - jetty-annotations - ${jetty.version} - - - org.eclipse.jetty - jetty-client - ${jetty.version} - - - org.eclipse.jetty - jetty-continuation - ${jetty.version} - - - org.eclipse.jetty - jetty-deploy - ${jetty.version} - - - org.eclipse.jetty - jetty-http - ${jetty.version} - - - org.eclipse.jetty - jetty-io - ${jetty.version} - - - org.eclipse.jetty - apache-jstl - ${jetty.version} - - - org.eclipse.jetty - apache-jsp - ${jetty.version} - - - org.eclipse.jetty - jetty-jmx - ${jetty.version} - - - org.eclipse.jetty - jetty-plus - ${jetty.version} - - - org.eclipse.jetty - jetty-security - ${jetty.version} - - - org.eclipse.jetty - jetty-server - ${jetty.version} - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - org.eclipse.jetty - jetty-servlets - ${jetty.version} - - - org.eclipse.jetty - jetty-util - ${jetty.version} - - - org.eclipse.jetty - jetty-webapp - ${jetty.version} - - - org.eclipse.jetty - jetty-xml - ${jetty.version} - - - com.toomuchcoding.jsonassert - jsonassert - ${jsonassert.version} - - - org.codehaus.groovy - groovy - 2.4.4 - - - org.skyscreamer - jsonassert - 1.2.3 - - - com.fasterxml.jackson.core - jackson-databind - 2.7.0 - - - javax.inject - javax.inject - 1 - - - org.apache.camel - camel-spring - ${camel.version} - - - javax.servlet - javax.servlet-api - 3.1.0 - - - args4j - args4j - 2.32 - - - com.jayway.restassured - spring-mock-mvc - 2.9.0 - - - org.eclipse.aether - aether-api - ${aether.version} - - - org.eclipse.aether - aether-impl - ${aether.version} - - - org.eclipse.aether - aether-transport-file - ${aether.version} - - - org.eclipse.aether - aether-transport-http - ${aether.version} - - - org.eclipse.aether - aether-connector-basic - ${aether.version} - - - org.apache.maven - maven-aether-provider - 3.3.9 - - - org.spockframework - spock-spring - 1.0-groovy-2.4 - - - org.spockframework - spock-core - 1.0-groovy-2.4 - - - info.solidsoft.spock - spock-global-unroll - 0.5.0 + org.springframework.cloud.contract + spring-cloud-contract-dependencies + ${project.version} + pom + import diff --git a/spring-cloud-contract-dependencies/.factorypath b/spring-cloud-contract-dependencies/.factorypath new file mode 100644 index 0000000000..e91bd5122d --- /dev/null +++ b/spring-cloud-contract-dependencies/.factorypath @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml new file mode 100644 index 0000000000..f4aee2ba7a --- /dev/null +++ b/spring-cloud-contract-dependencies/pom.xml @@ -0,0 +1,335 @@ + + + 4.0.0 + + spring-cloud-dependencies-parent + org.springframework.cloud + 1.1.2.BUILD-SNAPSHOT + + + org.springframework.cloud.contract + spring-cloud-contract-dependencies + 1.0.0.BUILD-SNAPSHOT + pom + spring-cloud-contract-dependencies + Spring Cloud Contract Dependencies + + 2.1.7 + 0.4.7 + 2.17.0 + 1.1.0 + 9.2.13.v20150730 + 1.0.2.RELEASE + 1.0.3.BUILD-SNAPSHOT + 1.1.5.BUILD-SNAPSHOT + 1.4.0.BUILD-SNAPSHOT + + + + + org.springframework.cloud.contract + spring-cloud-contract-spec + ${project.version} + + + org.springframework.cloud.contract + spring-cloud-contract-verifier-core + ${project.version} + + + org.springframework.cloud.contract + spring-cloud-contract-verifier-testing-utils + ${project.version} + + + org.springframework.cloud.contract + spring-cloud-contract-stub-runner + ${project.version} + + + org.springframework.cloud.contract + spring-cloud-contract-stub-runner-spring + ${project.version} + + + org.springframework.cloud.contract + spring-cloud-contract-stub-runner-boot + ${project.version} + + + org.springframework.cloud.contract + spring-cloud-contract-verifier-messaging-core + ${project.version} + + + org.springframework.cloud.contract + spring-cloud-contract-verifier-camel + ${project.version} + + + org.springframework.cloud.contract + spring-cloud-contract-verifier-integration + ${project.version} + + + org.springframework.cloud.contract + spring-cloud-contract-verifier-stream + ${project.version} + + + commons-io + commons-io + 2.0 + + + org.apache.commons + commons-lang3 + 3.3 + + + com.github.tomakehurst + wiremock + ${wiremock.version} + + + org.eclipse.jetty + jetty-annotations + ${jetty.version} + + + org.eclipse.jetty + jetty-client + ${jetty.version} + + + org.eclipse.jetty + jetty-continuation + ${jetty.version} + + + org.eclipse.jetty + jetty-deploy + ${jetty.version} + + + org.eclipse.jetty + jetty-http + ${jetty.version} + + + org.eclipse.jetty + jetty-io + ${jetty.version} + + + org.eclipse.jetty + apache-jstl + ${jetty.version} + + + org.eclipse.jetty + apache-jsp + ${jetty.version} + + + org.eclipse.jetty + jetty-jmx + ${jetty.version} + + + org.eclipse.jetty + jetty-plus + ${jetty.version} + + + org.eclipse.jetty + jetty-security + ${jetty.version} + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + + + org.eclipse.jetty + jetty-servlets + ${jetty.version} + + + org.eclipse.jetty + jetty-util + ${jetty.version} + + + org.eclipse.jetty + jetty-webapp + ${jetty.version} + + + org.eclipse.jetty + jetty-xml + ${jetty.version} + + + com.toomuchcoding.jsonassert + jsonassert + ${jsonassert.version} + + + org.skyscreamer + jsonassert + 1.2.3 + + + org.apache.camel + camel-spring + ${camel.version} + + + args4j + args4j + 2.32 + + + com.jayway.restassured + spring-mock-mvc + 2.9.0 + + + org.eclipse.aether + aether-api + ${aether.version} + + + org.eclipse.aether + aether-impl + ${aether.version} + + + org.eclipse.aether + aether-transport-file + ${aether.version} + + + org.eclipse.aether + aether-transport-http + ${aether.version} + + + org.eclipse.aether + aether-connector-basic + ${aether.version} + + + org.apache.maven + maven-aether-provider + 3.3.9 + + + org.spockframework + spock-spring + 1.0-groovy-2.4 + + + org.spockframework + spock-core + 1.0-groovy-2.4 + + + info.solidsoft.spock + spock-global-unroll + 0.5.0 + + + org.springframework.cloud + spring-cloud-netflix-dependencies + ${spring-cloud-netflix.version} + pom + import + + + org.springframework.cloud + spring-cloud-stream-dependencies + ${spring-cloud-stream.version} + pom + import + + + org.springframework.cloud + spring-cloud-zookeeper-dependencies + ${spring-cloud-zookeeper.version} + pom + import + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + + + spring + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/libs-snapshot-local + + true + + + false + + + + spring-milestones + Spring Milestones + http://repo.spring.io/libs-milestone-local + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/libs-snapshot-local + + true + + + false + + + + spring-milestones + Spring Milestones + http://repo.spring.io/libs-milestone-local + + false + + + + + + diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRepository.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRepository.groovy index 2f7f77c74a..c471e63555 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRepository.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRepository.groovy @@ -62,7 +62,7 @@ class StubRepository { } private List contextDescriptors() { - return path.exists() ? collectMappingDescriptors(path) : [] + return (path.exists() ? collectMappingDescriptors(path) : []) as List } private List collectMappingDescriptors(File descriptorsDirectory) { @@ -76,7 +76,7 @@ class StubRepository { } private Collection contractDescriptors() { - return path.exists() ? collectContractDescriptors(path) : [] + return (path.exists() ? collectContractDescriptors(path) : []) as Collection } private Collection collectContractDescriptors(File descriptorsDirectory) { diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.groovy index 7e49ad4ee0..4a0aaf63cc 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerExecutor.groovy @@ -122,7 +122,7 @@ class StubRunnerExecutor implements StubFinder { Map> labels() { return getContracts().collectEntries { [(it.key.toColonSeparatedDependencyNotation()) : it.value.collect { it.label }] - } as Map> + } as Map> } private void sendMessageIfApplicable(Contract groovyDsl) { diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.groovy index 6429e56252..6980b01e77 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.groovy @@ -42,7 +42,7 @@ class StubRunnerFactory { return stubRunnerOptions.getDependencies().collect { StubConfiguration stubsConfiguration -> Map.Entry entry = stubDownloader.downloadAndUnpackStubJar(stubRunnerOptions, stubsConfiguration) if (!entry) { - return null + return (StubRunner) null } return createStubRunner(entry.key, entry.value) }.findAll { it != null } diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerOptionsBuilder.groovy b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerOptionsBuilder.groovy index 78b98c9186..4f67205b9c 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerOptionsBuilder.groovy +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/groovy/org/springframework/cloud/contract/stubrunner/StubRunnerOptionsBuilder.groovy @@ -106,7 +106,7 @@ class StubRunnerOptionsBuilder { } private static List stubsToList(String stubIdsToPortMapping) { - return stubIdsToPortMapping.split(',').collect { it } + return stubIdsToPortMapping.split(',').collect { it } as List } private void addStub(List notations) {