diff --git a/stub-runner/stub-runner-boot/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/streamService/0.0.1-SNAPSHOT/maven-metadata-local.xml b/stub-runner/stub-runner-boot/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/streamService/0.0.1-SNAPSHOT/maven-metadata-local.xml deleted file mode 100644 index bad844ba2a..0000000000 --- a/stub-runner/stub-runner-boot/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/streamService/0.0.1-SNAPSHOT/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - io.codearte.accurest.stubs - streamService - 0.0.1-SNAPSHOT - - - true - - 20160409062112 - - diff --git a/stub-runner/stub-runner-boot/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/streamService/maven-metadata-local.xml b/stub-runner/stub-runner-boot/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/streamService/maven-metadata-local.xml deleted file mode 100644 index dc32790f53..0000000000 --- a/stub-runner/stub-runner-boot/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/streamService/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - io.codearte.accurest.stubs - streamService - 0.0.1-SNAPSHOT - - - 0.0.1-SNAPSHOT - - 20160409062112 - - diff --git a/stub-runner/stub-runner-junit/src/test/groovy/io/codearte/accurest/stubrunner/junit/AccurestRuleSpec.groovy b/stub-runner/stub-runner-junit/src/test/groovy/io/codearte/accurest/stubrunner/junit/AccurestRuleSpec.groovy index a8bbca3cbd..7b5ee643fd 100644 --- a/stub-runner/stub-runner-junit/src/test/groovy/io/codearte/accurest/stubrunner/junit/AccurestRuleSpec.groovy +++ b/stub-runner/stub-runner-junit/src/test/groovy/io/codearte/accurest/stubrunner/junit/AccurestRuleSpec.groovy @@ -20,7 +20,7 @@ class AccurestRuleSpec extends Specification { // tag::classrule[] @ClassRule @Shared AccurestRule rule = new AccurestRule() - .repoRoot(AccurestRuleSpec.getResource("/m2repo").toURI().toString()) + .repoRoot(AccurestRuleSpec.getResource("/m2repo/repository").toURI().toString()) .downloadStub("io.codearte.accurest.stubs", "loanIssuance") .downloadStub("io.codearte.accurest.stubs:fraudDetectionServer") diff --git a/stub-runner/stub-runner-junit/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/maven-metadata-local.xml b/stub-runner/stub-runner-junit/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/maven-metadata-local.xml deleted file mode 100644 index 0bd6282c8e..0000000000 --- a/stub-runner/stub-runner-junit/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - io.codearte.accurest.stubs - fraudDetectionServer - 0.0.1-SNAPSHOT - - - true - - 20160409062112 - - diff --git a/stub-runner/stub-runner-junit/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/0.0.1-SNAPSHOT/maven-metadata-local.xml b/stub-runner/stub-runner-junit/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/0.0.1-SNAPSHOT/maven-metadata-local.xml deleted file mode 100644 index 5220bd8f0a..0000000000 --- a/stub-runner/stub-runner-junit/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/0.0.1-SNAPSHOT/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - io.codearte.accurest.stubs - loanIssuance - 0.0.1-SNAPSHOT - - - true - - 20160409062111 - - diff --git a/stub-runner/stub-runner-spring-cloud/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/maven-metadata-local.xml b/stub-runner/stub-runner-spring-cloud/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/maven-metadata-local.xml deleted file mode 100644 index 0bd6282c8e..0000000000 --- a/stub-runner/stub-runner-spring-cloud/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - io.codearte.accurest.stubs - fraudDetectionServer - 0.0.1-SNAPSHOT - - - true - - 20160409062112 - - diff --git a/stub-runner/stub-runner-junit/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/maven-metadata-local.xml b/stub-runner/stub-runner-spring-cloud/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/maven-metadata.xml similarity index 100% rename from stub-runner/stub-runner-junit/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/maven-metadata-local.xml rename to stub-runner/stub-runner-spring-cloud/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/maven-metadata.xml diff --git a/stub-runner/stub-runner-spring-cloud/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/0.0.1-SNAPSHOT/maven-metadata-local.xml b/stub-runner/stub-runner-spring-cloud/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/0.0.1-SNAPSHOT/maven-metadata-local.xml deleted file mode 100644 index 5220bd8f0a..0000000000 --- a/stub-runner/stub-runner-spring-cloud/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/0.0.1-SNAPSHOT/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - io.codearte.accurest.stubs - loanIssuance - 0.0.1-SNAPSHOT - - - true - - 20160409062111 - - diff --git a/stub-runner/stub-runner-junit/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/maven-metadata-local.xml b/stub-runner/stub-runner-spring-cloud/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/maven-metadata.xml similarity index 100% rename from stub-runner/stub-runner-junit/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/maven-metadata-local.xml rename to stub-runner/stub-runner-spring-cloud/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/maven-metadata.xml diff --git a/stub-runner/stub-runner-spring/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/maven-metadata-local.xml b/stub-runner/stub-runner-spring/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/maven-metadata-local.xml deleted file mode 100644 index 0bd6282c8e..0000000000 --- a/stub-runner/stub-runner-spring/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/0.0.1-SNAPSHOT/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - io.codearte.accurest.stubs - fraudDetectionServer - 0.0.1-SNAPSHOT - - - true - - 20160409062112 - - diff --git a/stub-runner/stub-runner-spring/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/maven-metadata-local.xml b/stub-runner/stub-runner-spring/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/maven-metadata-local.xml deleted file mode 100644 index d4ab9afc83..0000000000 --- a/stub-runner/stub-runner-spring/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - io.codearte.accurest.stubs - fraudDetectionServer - 0.0.1-SNAPSHOT - - - 0.0.1-SNAPSHOT - - 20160409062112 - - diff --git a/stub-runner/stub-runner-spring-cloud/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/maven-metadata-local.xml b/stub-runner/stub-runner-spring/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/maven-metadata.xml similarity index 100% rename from stub-runner/stub-runner-spring-cloud/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/maven-metadata-local.xml rename to stub-runner/stub-runner-spring/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/fraudDetectionServer/maven-metadata.xml diff --git a/stub-runner/stub-runner-spring/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/0.0.1-SNAPSHOT/maven-metadata-local.xml b/stub-runner/stub-runner-spring/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/0.0.1-SNAPSHOT/maven-metadata-local.xml deleted file mode 100644 index 5220bd8f0a..0000000000 --- a/stub-runner/stub-runner-spring/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/0.0.1-SNAPSHOT/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - io.codearte.accurest.stubs - loanIssuance - 0.0.1-SNAPSHOT - - - true - - 20160409062111 - - diff --git a/stub-runner/stub-runner-spring/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/maven-metadata-local.xml b/stub-runner/stub-runner-spring/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/maven-metadata-local.xml deleted file mode 100644 index bf14a1ad21..0000000000 --- a/stub-runner/stub-runner-spring/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - io.codearte.accurest.stubs - loanIssuance - 0.0.1-SNAPSHOT - - - 0.0.1-SNAPSHOT - - 20160409062111 - - diff --git a/stub-runner/stub-runner-spring-cloud/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/maven-metadata-local.xml b/stub-runner/stub-runner-spring/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/maven-metadata.xml similarity index 100% rename from stub-runner/stub-runner-spring-cloud/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/maven-metadata-local.xml rename to stub-runner/stub-runner-spring/src/test/resources/m2repo/repository/io/codearte/accurest/stubs/loanIssuance/maven-metadata.xml diff --git a/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/AetherStubDownloader.groovy b/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/AetherStubDownloader.groovy index 46f8dee7f8..a01aa9211f 100644 --- a/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/AetherStubDownloader.groovy +++ b/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/AetherStubDownloader.groovy @@ -37,29 +37,21 @@ class AetherStubDownloader implements StubDownloader { private static final String MAVEN_LOCAL_REPOSITORY_LOCATION = 'maven.repo.local' private static final String ACCUREST_TEMP_DIR_PREFIX = 'accurest' private static final String ARTIFACT_EXTENSION = 'jar' - private static final String LATEST_ARTIFACT_VERSION = '(0,]' + private static final String LATEST_ARTIFACT_VERSION = '(,]' private static final String LATEST_VERSION_IN_IVY = "+" private final List remoteRepos private final RepositorySystem repositorySystem private final RepositorySystemSession session - AetherStubDownloader(RepositorySystem repositorySystem, List repositories, RepositorySystemSession session) { - this.remoteRepos = repositories - this.repositorySystem = repositorySystem ?: newRepositorySystem() - this.session = session ?: newSession(this.repositorySystem) - } - AetherStubDownloader(StubRunnerOptions stubRunnerOptions) { this.remoteRepos = remoteRepositories(stubRunnerOptions) + log.info("Download using remote repositories $remoteRepos") this.repositorySystem = newRepositorySystem() - this.session = newSession(this.repositorySystem) + this.session = newSession(this.repositorySystem, stubRunnerOptions.workOffline) } private List remoteRepositories(StubRunnerOptions stubRunnerOptions) { - if (stubRunnerOptions.workOffline || !stubRunnerOptions.stubRepositoryRoot) { - return [] - } return stubRunnerOptions.stubRepositoryRoot.split(',').collect { String repo -> new RemoteRepository.Builder("remote", "default", repo).build() } @@ -73,35 +65,34 @@ class AetherStubDownloader implements StubDownloader { return locator.getService(RepositorySystem) } - private RepositorySystemSession newSession(RepositorySystem system) { - DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession(); + private RepositorySystemSession newSession(RepositorySystem system, boolean workOffline) { + DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession() session.setUpdatePolicy(RepositoryPolicy.UPDATE_POLICY_ALWAYS) - LocalRepository localRepo = new LocalRepository(System.getProperty(MAVEN_LOCAL_REPOSITORY_LOCATION, "${System.getProperty("user.home")}/.m2/repository")); - session.setLocalRepositoryManager(system.newLocalRepositoryManager(session, localRepo)); - return session; + session.setOffline(workOffline) + LocalRepository localRepo = new LocalRepository(localRepositoryDirectory()) + session.setLocalRepositoryManager(system.newLocalRepositoryManager(session, localRepo)) + return session } - @Override - public File downloadAndUnpackStubJar(boolean workOffline, String stubRepositoryRoot, String stubsGroup, String stubsModule, String classifier) { - String version = getVersion(stubsGroup, stubsModule, LATEST_VERSION_IN_IVY, classifier) - return unpackedJar(version, stubsGroup, stubsModule, classifier, stubRepositoryRoot) + private String localRepositoryDirectory() { + System.getProperty(MAVEN_LOCAL_REPOSITORY_LOCATION, "${System.getProperty("user.home")}/.m2/repository") } - private File unpackedJar(String resolvedVersion, String stubsGroup, String stubsModule, String classifier, String stubRepositoryRoot) { - log.info("Resolved version is $resolvedVersion") + private File unpackedJar(String resolvedVersion, String stubsGroup, String stubsModule, String classifier) { + log.info("Resolved version is [$resolvedVersion]") if (!resolvedVersion) { - log.warn("Stub for group [$stubsGroup] module [$stubsModule] and classifier [$classifier] not found in [$stubRepositoryRoot]") + log.warn("Stub for group [$stubsGroup] module [$stubsModule] and classifier [$classifier] not found in $remoteRepos") return null } Artifact artifact = new DefaultArtifact(stubsGroup, stubsModule, classifier, ARTIFACT_EXTENSION, resolvedVersion) ArtifactRequest request = new ArtifactRequest(artifact: artifact, repositories: remoteRepos) - log.info("Resolving artifact $artifact from ${remoteRepos ?: 'local maven repo'}") + log.info("Resolving artifact $artifact using repository $remoteRepos") try { ArtifactResult result = repositorySystem.resolveArtifact(session, request) - log.info("Resolved artifact $artifact to ${result.artifact.file} from ${result.repository}") + log.info("Resolved artifact $artifact to ${result.artifact.file}") return unpackStubJarToATemporaryFolder(result.artifact.file.toURI()) } catch (Exception e) { - log.warn("Exception occured while trying to download a stub for group [$stubsGroup] module [$stubsModule] and classifier [$classifier] in [$stubRepositoryRoot]", e) + log.warn("Exception occured while trying to download a stub for group [$stubsGroup] module [$stubsModule] and classifier [$classifier] in $remoteRepos", e) return null } @@ -110,7 +101,7 @@ class AetherStubDownloader implements StubDownloader { private String getVersion(String stubsGroup, String stubsModule, String version, String classifier) { if (!version || LATEST_VERSION_IN_IVY == version) { log.info("Desired version is [$version] - will try to resolve the latest version") - return resolveHighestArtifactVersion(stubsGroup, stubsModule, classifier); + return resolveHighestArtifactVersion(stubsGroup, stubsModule, classifier) } log.info("Will try to resolve version [$version]") return resolveArtifactVersion(stubsGroup, stubsModule, version, classifier) @@ -120,7 +111,7 @@ class AetherStubDownloader implements StubDownloader { Map.Entry downloadAndUnpackStubJar(StubRunnerOptions options, StubConfiguration stubConfiguration) { String version = getVersion(stubConfiguration.groupId, stubConfiguration.artifactId, stubConfiguration.version, stubConfiguration.classifier) File unpackedJar = unpackedJar(version, stubConfiguration.groupId, stubConfiguration.artifactId, - stubConfiguration.classifier, options.stubRepositoryRoot) + stubConfiguration.classifier) if (!unpackedJar) { return null } @@ -130,15 +121,18 @@ class AetherStubDownloader implements StubDownloader { private String resolveHighestArtifactVersion(String stubsGroup, String stubsModule, String classifier) { Artifact artifact = new DefaultArtifact(stubsGroup, stubsModule, classifier, ARTIFACT_EXTENSION, LATEST_ARTIFACT_VERSION) - VersionRangeRequest versionRangeRequest = new VersionRangeRequest(artifact, remoteRepos, null); - VersionRangeResult rangeResult = repositorySystem.resolveVersionRange(session, versionRangeRequest); + VersionRangeRequest versionRangeRequest = new VersionRangeRequest(artifact, remoteRepos, null) + VersionRangeResult rangeResult = repositorySystem.resolveVersionRange(session, versionRangeRequest) + if (!rangeResult.highestVersion) { + log.error("Version was not resolved!") + } return rangeResult.highestVersion ?: '' } private String resolveArtifactVersion(String stubsGroup, String stubsModule, String version, String classifier) { Artifact artifact = new DefaultArtifact(stubsGroup, stubsModule, classifier, ARTIFACT_EXTENSION, version) VersionRequest versionRequest = new VersionRequest(artifact, remoteRepos, null) - VersionResult versionResult = repositorySystem.resolveVersion(session, versionRequest); + VersionResult versionResult = repositorySystem.resolveVersion(session, versionRequest) return versionResult.version ?: '' } diff --git a/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubDownloader.groovy b/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubDownloader.groovy index def3d78ae6..e3391a67ef 100644 --- a/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubDownloader.groovy +++ b/stub-runner/stub-runner/src/main/groovy/io/codearte/accurest/stubrunner/StubDownloader.groovy @@ -2,10 +2,6 @@ package io.codearte.accurest.stubrunner interface StubDownloader { - @Deprecated - File downloadAndUnpackStubJar(boolean workOffline, String stubRepositoryRoot, String stubsGroup, String - stubsModule, String classifier) - /** * Returns a mapping of updated StubConfiguration (it will contain the resolved version) and the location of the downloaded JAR. * If there was no artifact this method will return {@code null}.