From a5f83f946a4ba82b30eed6b2c4ecb7a4ad19842d Mon Sep 17 00:00:00 2001 From: Stein Martin Hustad Date: Fri, 23 Oct 2020 11:35:52 +0200 Subject: [PATCH 1/2] Fix invalid resource url on windows (#1537) --- .../cloud/contract/stubrunner/StubRunnerFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java index 5ff6543531..f0e1cf9f81 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerFactory.java @@ -99,7 +99,7 @@ class StubRunnerFactory { } private Path resolvePath(File unpackedLocation) { - Resource resource = ResourceResolver.resource(unpackedLocation.getPath()); + Resource resource = ResourceResolver.resource(unpackedLocation.toURI().toString()); Path path = unpackedLocation.toPath(); if (resource != null) { try { From 60ebf1aeda4273076d6beb1176ab77c1f9bc425f Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 26 Oct 2020 12:40:14 +0100 Subject: [PATCH 2/2] Bumped java docker image version --- docker/spring-cloud-contract-docker/Dockerfile | 2 +- docker/spring-cloud-contract-stub-runner-docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/spring-cloud-contract-docker/Dockerfile b/docker/spring-cloud-contract-docker/Dockerfile index edcb290745..3c21194599 100644 --- a/docker/spring-cloud-contract-docker/Dockerfile +++ b/docker/spring-cloud-contract-docker/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:19.10 -ARG SDKMAN_JAVA_INSTALLATION=8.0.265.hs-adpt +ARG SDKMAN_JAVA_INSTALLATION=8.0.272.hs-adpt MAINTAINER Marcin Grzejszczak diff --git a/docker/spring-cloud-contract-stub-runner-docker/Dockerfile b/docker/spring-cloud-contract-stub-runner-docker/Dockerfile index 7fe7c50e1b..e67389f9e0 100644 --- a/docker/spring-cloud-contract-stub-runner-docker/Dockerfile +++ b/docker/spring-cloud-contract-stub-runner-docker/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:19.10 -ARG SDKMAN_JAVA_INSTALLATION=8.0.265.hs-adpt +ARG SDKMAN_JAVA_INSTALLATION=8.0.272.hs-adpt MAINTAINER Marcin Grzejszczak