Merge remote-tracking branch 'origin/2.2.x'

# Conflicts:
#	pom.xml
This commit is contained in:
Olga Maciaszek-Sharma
2020-10-28 17:53:01 +01:00

View File

@@ -25,7 +25,7 @@
</scm>
<properties>
<main.basedir>${basedir}</main.basedir>
<jackson.version>2.11.2</jackson.version>
<jackson.version>2.11.3</jackson.version>
<spring-cloud-commons.version>3.0.0-SNAPSHOT</spring-cloud-commons.version>
<!-- Plugin versions -->