From 7641bcadade2b3d149b398f3844aea2dc4a63e4d Mon Sep 17 00:00:00 2001 From: Chris Phillipson Date: Mon, 19 Aug 2019 06:49:56 -0700 Subject: [PATCH] Update dependencies * Spring Boot forward to 2.2.0.M5 * Drop back to jgit 5.3.2 b/c of unresolved conflict that appears on startup only due to Git bash issue on Windows; see https://github.com/diffplug/spotless/issues/410#issuecomment-514831921 --- build.gradle | 6 +++--- build.w-mysql.gradle | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index ee767f27..5d38d46b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { id 'com.gorylenko.gradle-git-properties' version '2.1.0' - id 'org.springframework.boot' version '2.2.0.M4' + id 'org.springframework.boot' version '2.2.0.M5' id 'io.spring.dependency-management' version '1.0.8.RELEASE' - id 'com.github.ben-manes.versions' version '0.21.0' + id 'com.github.ben-manes.versions' version '0.22.0' id 'io.franzbecker.gradle-lombok' version '3.1.0' id 'java' id 'jacoco' @@ -124,7 +124,7 @@ dependencies { //runtime('io.r2dbc:r2dbc-pool:0.8.0.M8') implementation('io.r2dbc:r2dbc-h2:0.8.0.BUILD-SNAPSHOT') runtime('io.r2dbc:r2dbc-postgresql:0.8.0.BUILD-SNAPSHOT') - implementation('org.eclipse.jgit:org.eclipse.jgit:5.4.0.201906121030-r') + implementation('org.eclipse.jgit:org.eclipse.jgit:5.3.2.201906051522-r') implementation('org.springframework.boot:spring-boot-starter-mail') implementation('com.sendgrid:sendgrid-java:4.4.1') { exclude group: 'org.apache.httpcomponents', module: 'httpclient' diff --git a/build.w-mysql.gradle b/build.w-mysql.gradle index 869f76db..173187a0 100644 --- a/build.w-mysql.gradle +++ b/build.w-mysql.gradle @@ -1,8 +1,8 @@ plugins { - id 'com.gorylenko.gradle-git-properties' version '2.0.0' - id 'org.springframework.boot' version '2.2.0.M4' + id 'com.gorylenko.gradle-git-properties' version '2.1.0' + id 'org.springframework.boot' version '2.2.0.M5' id 'io.spring.dependency-management' version '1.0.8.RELEASE' - id 'com.github.ben-manes.versions' version '0.21.0' + id 'com.github.ben-manes.versions' version '0.22.0' id 'io.franzbecker.gradle-lombok' version '3.1.0' id 'java' id 'jacoco' @@ -127,7 +127,7 @@ dependencies { implementation('io.r2dbc:r2dbc-h2:0.8.0.M8') runtime('io.r2dbc:r2dbc-postgresql:0.8.0.M8') runtime('com.github.mirromutth:r2dbc-mysql:0.2.0.M2') - implementation('org.eclipse.jgit:org.eclipse.jgit:5.4.0.201906121030-r') + implementation('org.eclipse.jgit:org.eclipse.jgit:5.3.2.201906051522-r') implementation('org.springframework.boot:spring-boot-starter-mail') implementation('com.sendgrid:sendgrid-java:4.4.1') { exclude group: 'org.apache.httpcomponents', module: 'httpclient'