From c0f66e9f598cc04211bf4b2e805e54fc832cfe01 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Fri, 8 Jan 2021 17:31:17 +0000
Subject: [PATCH] Make spring-core optional

It isn't really optional, but no-one uses Spring Retry without it
and some older build systems (Gradle old versions) don't like finding
multiple versions of thw same library.
---
 pipeline.yml | 2 +-
 pom.xml      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pipeline.yml b/pipeline.yml
index 96f8162..74662d7 100644
--- a/pipeline.yml
+++ b/pipeline.yml
@@ -88,7 +88,7 @@ jobs:
         - |
           rm -rf ~/.m2
           ln -s $(pwd)/.m2 ~/.m2
-          ./mvnw install -s .mvn/settings.xml -Dspring.framework.version=5.0.0.RC2
+          ./mvnw install -s .mvn/settings.xml -Dspring.framework.version=5.3.2
     params:
       TERM: dumb
       passphrase: {{passphrase}}
diff --git a/pom.xml b/pom.xml
index ef76006..2d57d2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -262,6 +262,8 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
+			<!-- Not really optional, but since it works with 4 and 5 this is safe -->
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>