From 7270ca5cf4a9632f63bf27bc7c7a7af3daabf361 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 16 Jan 2020 15:15:21 +0100 Subject: [PATCH] Polish "Remove deprecated Joda-Time support" See gh-19699 --- .../boot/cli/GrabCommandIntegrationTests.java | 2 +- .../src/test/resources/grab-samples/grab.groovy | 2 +- spring-boot-project/spring-boot-dependencies/build.gradle | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java index f7a9f20db9..6c8874e0d5 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java +++ b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java @@ -61,7 +61,7 @@ class GrabCommandIntegrationTests { System.setProperty("groovy.grape.report.downloads", "true"); // Use --autoconfigure=false to limit the amount of downloaded dependencies String output = this.cli.grab("grab.groovy", "--autoconfigure=false"); - assertThat(new File(this.cli.getTemp(), "repository/joda-time/joda-time")).isDirectory(); + assertThat(new File(this.cli.getTemp(), "repository/com/fasterxml/jackson/core/jackson-core")).isDirectory(); assertThat(output).contains("Downloading: "); } diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/grab-samples/grab.groovy b/spring-boot-project/spring-boot-cli/src/test/resources/grab-samples/grab.groovy index e99f623452..578226ed5a 100644 --- a/spring-boot-project/spring-boot-cli/src/test/resources/grab-samples/grab.groovy +++ b/spring-boot-project/spring-boot-cli/src/test/resources/grab-samples/grab.groovy @@ -1,4 +1,4 @@ -@Grab('joda-time') +@Grab('jackson-core') class GrabTest { } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index f9ed786ddd..c73dc6c60f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -911,13 +911,6 @@ bom { ] } } - library('Joda Time', '2.10.5') { - group('joda-time') { - modules = [ - 'joda-time' - ] - } - } library('Johnzon', '1.2.2') { group('org.apache.johnzon') { modules = [