From 340113fab30a802e5c9635b5e50b475fd665f227 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Tue, 13 Aug 2019 11:24:14 +0200
Subject: [PATCH 1/4] Upgraded the circleci image

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 15630127fb..615bf60ef7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,8 +2,8 @@ version: 2
 jobs:
   build:
     docker:
-      - image: springcloud/pipeline-base
-    environment:
+      - image: cloudpipelines/pipeline-base
+    environment:WW
       JAVA_TOOL_OPTIONS: "-Xms64m -Xmx300m"
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xms64m -Xmx300m -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false'
       TERM: dumb

From 74eed14a0d8c5c9033ea2fa1250b412031a34bf9 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Tue, 13 Aug 2019 11:42:18 +0200
Subject: [PATCH 2/4] Upgraded the circleci image

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 615bf60ef7..e49cc159ca 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
   build:
     docker:
       - image: cloudpipelines/pipeline-base
-    environment:WW
+    environment:
       JAVA_TOOL_OPTIONS: "-Xms64m -Xmx300m"
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xms64m -Xmx300m -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false'
       TERM: dumb

From f4fef09eb6e453b400f59dabd5f2016740065769 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Tue, 13 Aug 2019 12:19:24 +0200
Subject: [PATCH 3/4] Throw an exception when Java can't be parsed

---
 .../verifier/util/ContractVerifierDslConverter.groovy | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContractVerifierDslConverter.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContractVerifierDslConverter.groovy
index f5590a8159..e2841d49d6 100644
--- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContractVerifierDslConverter.groovy
+++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContractVerifierDslConverter.groovy
@@ -128,19 +128,16 @@ class ContractVerifierDslConverter implements ContractConverter<Collection<Contr
 	private static Object toObject(ClassLoader cl, File rootFolder, File dsl) {
 		if (isJava(dsl)) {
 			try {
-				return parseJavaFile(cl, dsl)
+				return parseJavaFile(dsl)
 			}
 			catch (Exception ex) {
-				if (log.isWarnEnabled()) {
-					log.warn("Exception occurred while trying to parse the file [" + dsl + "] as a contract. Will not parse it.", ex)
-				}
-				return null
+				throw new DslParseException("Exception occurred while trying to parse the file [" + dsl + "] as a contract. Will not parse it.", ex)
 			}
 		}
 		return groovyShell(cl, rootFolder).evaluate(dsl)
 	}
 
-	private static Object parseJavaFile(ClassLoader cl, File dsl) {
+	private static Object parseJavaFile(File dsl) {
 		Constructor<?> constructor = classConstructor(dsl)
 		Object newInstance = constructor.newInstance()
 		if (!newInstance instanceof Supplier) {
@@ -161,7 +158,7 @@ class ContractVerifierDslConverter implements ContractConverter<Collection<Contr
 		if (!compilationResult.wasSuccessful()) {
 			throw new IllegalStateException("Exceptions occurred while trying to compile the file " + compilationResult.compilationMessages)
 		}
-		Class<?> clazz = compilationResult.compiledClasses.find { it.name == fqn}
+		Class<?> clazz = compilationResult.compiledClasses.find { it.name == fqn }
 		if (clazz == null) {
 			throw new IllegalStateException("Class with name [" + fqn + "] not found")
 		}

From 2419b5336272c5ea74f84f8b8a251dc78f127575 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Tue, 13 Aug 2019 12:49:45 +0200
Subject: [PATCH 4/4] Lowered logging level temporarilly

---
 spring-cloud-contract-verifier/src/test/resources/logback.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-contract-verifier/src/test/resources/logback.xml b/spring-cloud-contract-verifier/src/test/resources/logback.xml
index 38fb9e2a71..574bdb0622 100644
--- a/spring-cloud-contract-verifier/src/test/resources/logback.xml
+++ b/spring-cloud-contract-verifier/src/test/resources/logback.xml
@@ -9,7 +9,7 @@
 
 	<logger name="com.github.jknack.handlebars.internal" level="INFO"/>
 
-	<logger name="org.springframework.cloud.function" level="INFO"/>
+<!--	<logger name="org.springframework.cloud.function" level="INFO"/>-->
 
 	<root level="DEBUG">
 		<appender-ref ref="STDOUT"/>