deps: Upgraded spring boot plugin and jdbc drivers

redis · Sep 3, 2023 · 2555d10 · 2555d10
1 parent 986fc8a
commit 2555d10
Show file tree

Hide file tree

Showing 60 changed files with 23 additions and 27 deletions.
diff --git a/build.gradle b/build.gradle
@@ -21,7 +21,6 @@ config {
         inceptionYear = '2020'
         vendor = 'Redis'
         tags = ['redis', 'tool', 'import', 'export', 'replication']
-        bytecodeVersion = 8
 
         links {
             website      = "https://github.com/redis-developer/${project.rootProject.name}"

diff --git a/core/riot-db/gradle.properties → connectors/riot-db/gradle.properties b/core/riot-db/gradle.properties → connectors/riot-db/gradle.properties
diff --git a/core/riot-db/riot-db.gradle → connectors/riot-db/riot-db.gradle b/core/riot-db/riot-db.gradle → connectors/riot-db/riot-db.gradle
diff --git a/.../com/redis/riot/db/DataSourceOptions.java → .../com/redis/riot/db/DataSourceOptions.java b/.../com/redis/riot/db/DataSourceOptions.java → .../com/redis/riot/db/DataSourceOptions.java
diff --git a/...ava/com/redis/riot/db/DatabaseExport.java → ...ava/com/redis/riot/db/DatabaseExport.java b/...ava/com/redis/riot/db/DatabaseExport.java → ...ava/com/redis/riot/db/DatabaseExport.java
diff --git a/...ava/com/redis/riot/db/DatabaseImport.java → ...ava/com/redis/riot/db/DatabaseImport.java b/...ava/com/redis/riot/db/DatabaseImport.java → ...ava/com/redis/riot/db/DatabaseImport.java
diff --git a/...java/com/redis/riot/db/DatabaseUtils.java → ...java/com/redis/riot/db/DatabaseUtils.java b/...java/com/redis/riot/db/DatabaseUtils.java → ...java/com/redis/riot/db/DatabaseUtils.java
diff --git a/...java/com/redis/riot/db/DatabaseTests.java → ...java/com/redis/riot/db/DatabaseTests.java b/...java/com/redis/riot/db/DatabaseTests.java → ...java/com/redis/riot/db/DatabaseTests.java
diff --git a/...java/com/redis/riot/db/PostgresTests.java → ...java/com/redis/riot/db/PostgresTests.java b/...java/com/redis/riot/db/PostgresTests.java → ...java/com/redis/riot/db/PostgresTests.java
diff --git a/...va/com/redis/riot/db/SqlScriptRunner.java → ...va/com/redis/riot/db/SqlScriptRunner.java b/...va/com/redis/riot/db/SqlScriptRunner.java → ...va/com/redis/riot/db/SqlScriptRunner.java
diff --git a/core/riot-faker/gradle.properties → connectors/riot-faker/gradle.properties b/core/riot-faker/gradle.properties → connectors/riot-faker/gradle.properties
diff --git a/core/riot-faker/riot-faker.gradle → connectors/riot-faker/riot-faker.gradle b/core/riot-faker/riot-faker.gradle → connectors/riot-faker/riot-faker.gradle
diff --git a/...ava/com/redis/riot/faker/FakerImport.java → ...ava/com/redis/riot/faker/FakerImport.java b/...ava/com/redis/riot/faker/FakerImport.java → ...ava/com/redis/riot/faker/FakerImport.java
diff --git a/...com/redis/riot/faker/FakerItemReader.java → ...com/redis/riot/faker/FakerItemReader.java b/...com/redis/riot/faker/FakerItemReader.java → ...com/redis/riot/faker/FakerItemReader.java
diff --git a/...iot/faker/ReflectivePropertyAccessor.java → ...iot/faker/ReflectivePropertyAccessor.java b/...iot/faker/ReflectivePropertyAccessor.java → ...iot/faker/ReflectivePropertyAccessor.java
diff --git a/...om/redis/riot/faker/FakerReaderTests.java → ...om/redis/riot/faker/FakerReaderTests.java b/...om/redis/riot/faker/FakerReaderTests.java → ...om/redis/riot/faker/FakerReaderTests.java
diff --git a/core/riot-file/gradle.properties → connectors/riot-file/gradle.properties b/core/riot-file/gradle.properties → connectors/riot-file/gradle.properties
diff --git a/core/riot-file/riot-file.gradle → connectors/riot-file/riot-file.gradle b/core/riot-file/riot-file.gradle → connectors/riot-file/riot-file.gradle
diff --git a/.../com/redis/riot/file/AmazonS3Options.java → .../com/redis/riot/file/AmazonS3Options.java b/.../com/redis/riot/file/AmazonS3Options.java → .../com/redis/riot/file/AmazonS3Options.java
diff --git a/...s/riot/file/AmazonS3ProtocolResolver.java → ...s/riot/file/AmazonS3ProtocolResolver.java b/...s/riot/file/AmazonS3ProtocolResolver.java → ...s/riot/file/AmazonS3ProtocolResolver.java
diff --git a/...a/com/redis/riot/file/FileDumpExport.java → ...a/com/redis/riot/file/FileDumpExport.java b/...a/com/redis/riot/file/FileDumpExport.java → ...a/com/redis/riot/file/FileDumpExport.java
diff --git a/...com/redis/riot/file/FileDumpFunction.java → ...com/redis/riot/file/FileDumpFunction.java b/...com/redis/riot/file/FileDumpFunction.java → ...com/redis/riot/file/FileDumpFunction.java
diff --git a/...a/com/redis/riot/file/FileDumpImport.java → ...a/com/redis/riot/file/FileDumpImport.java b/...a/com/redis/riot/file/FileDumpImport.java → ...a/com/redis/riot/file/FileDumpImport.java
diff --git a/...ava/com/redis/riot/file/FileDumpType.java → ...ava/com/redis/riot/file/FileDumpType.java b/...ava/com/redis/riot/file/FileDumpType.java → ...ava/com/redis/riot/file/FileDumpType.java
diff --git a/...va/com/redis/riot/file/FileExtension.java → ...va/com/redis/riot/file/FileExtension.java b/...va/com/redis/riot/file/FileExtension.java → ...va/com/redis/riot/file/FileExtension.java
diff --git a/.../java/com/redis/riot/file/FileImport.java → .../java/com/redis/riot/file/FileImport.java b/.../java/com/redis/riot/file/FileImport.java → .../java/com/redis/riot/file/FileImport.java
diff --git a/...java/com/redis/riot/file/FileOptions.java → ...java/com/redis/riot/file/FileOptions.java b/...java/com/redis/riot/file/FileOptions.java → ...java/com/redis/riot/file/FileOptions.java
diff --git a/...in/java/com/redis/riot/file/FileType.java → ...in/java/com/redis/riot/file/FileType.java b/...in/java/com/redis/riot/file/FileType.java → ...in/java/com/redis/riot/file/FileType.java
diff --git a/...n/java/com/redis/riot/file/FileUtils.java → ...n/java/com/redis/riot/file/FileUtils.java b/...n/java/com/redis/riot/file/FileUtils.java → ...n/java/com/redis/riot/file/FileUtils.java
diff --git a/...redis/riot/file/GoogleStorageOptions.java → ...redis/riot/file/GoogleStorageOptions.java b/...redis/riot/file/GoogleStorageOptions.java → ...redis/riot/file/GoogleStorageOptions.java
diff --git a/...edis/riot/file/HeaderCallbackHandler.java → ...edis/riot/file/HeaderCallbackHandler.java b/...edis/riot/file/HeaderCallbackHandler.java → ...edis/riot/file/HeaderCallbackHandler.java
diff --git a/...om/redis/riot/file/MapFieldSetMapper.java → ...om/redis/riot/file/MapFieldSetMapper.java b/...om/redis/riot/file/MapFieldSetMapper.java → ...om/redis/riot/file/MapFieldSetMapper.java
diff --git a/...m/redis/riot/file/RuntimeIOException.java → ...m/redis/riot/file/RuntimeIOException.java b/...m/redis/riot/file/RuntimeIOException.java → ...m/redis/riot/file/RuntimeIOException.java
diff --git a/...s/riot/file/UnknownFileTypeException.java → ...s/riot/file/UnknownFileTypeException.java b/...s/riot/file/UnknownFileTypeException.java → ...s/riot/file/UnknownFileTypeException.java
diff --git a/.../resource/AbstractResourceItemWriter.java → .../resource/AbstractResourceItemWriter.java b/.../resource/AbstractResourceItemWriter.java → .../resource/AbstractResourceItemWriter.java
diff --git a/...t/file/resource/CountingOutputStream.java → ...t/file/resource/CountingOutputStream.java b/...t/file/resource/CountingOutputStream.java → ...t/file/resource/CountingOutputStream.java
diff --git a/...resource/FilenameInputStreamResource.java → ...resource/FilenameInputStreamResource.java b/...resource/FilenameInputStreamResource.java → ...resource/FilenameInputStreamResource.java
diff --git a/...file/resource/FlatResourceItemWriter.java → ...file/resource/FlatResourceItemWriter.java b/...file/resource/FlatResourceItemWriter.java → ...file/resource/FlatResourceItemWriter.java
diff --git a/...source/FlatResourceItemWriterBuilder.java → ...source/FlatResourceItemWriterBuilder.java b/...source/FlatResourceItemWriterBuilder.java → ...source/FlatResourceItemWriterBuilder.java
diff --git a/...file/resource/JsonResourceItemWriter.java → ...file/resource/JsonResourceItemWriter.java b/...file/resource/JsonResourceItemWriter.java → ...file/resource/JsonResourceItemWriter.java
diff --git a/...source/JsonResourceItemWriterBuilder.java → ...source/JsonResourceItemWriterBuilder.java b/...source/JsonResourceItemWriterBuilder.java → ...source/JsonResourceItemWriterBuilder.java
diff --git a/...t/file/resource/OutputStreamResource.java → ...t/file/resource/OutputStreamResource.java b/...t/file/resource/OutputStreamResource.java → ...t/file/resource/OutputStreamResource.java
diff --git a/...ource/TransactionAwareBufferedWriter.java → ...ource/TransactionAwareBufferedWriter.java b/...ource/TransactionAwareBufferedWriter.java → ...ource/TransactionAwareBufferedWriter.java
diff --git a/...ile/resource/UncustomizedUrlResource.java → ...ile/resource/UncustomizedUrlResource.java b/...ile/resource/UncustomizedUrlResource.java → ...ile/resource/UncustomizedUrlResource.java
diff --git a/...dis/riot/file/resource/XmlItemReader.java → ...dis/riot/file/resource/XmlItemReader.java b/...dis/riot/file/resource/XmlItemReader.java → ...dis/riot/file/resource/XmlItemReader.java
diff --git a/...t/file/resource/XmlItemReaderBuilder.java → ...t/file/resource/XmlItemReaderBuilder.java b/...t/file/resource/XmlItemReaderBuilder.java → ...t/file/resource/XmlItemReaderBuilder.java
diff --git a/...s/riot/file/resource/XmlObjectReader.java → ...s/riot/file/resource/XmlObjectReader.java b/...s/riot/file/resource/XmlObjectReader.java → ...s/riot/file/resource/XmlObjectReader.java
diff --git a/.../file/resource/XmlResourceItemWriter.java → .../file/resource/XmlResourceItemWriter.java b/.../file/resource/XmlResourceItemWriter.java → .../file/resource/XmlResourceItemWriter.java
diff --git a/...esource/XmlResourceItemWriterBuilder.java → ...esource/XmlResourceItemWriterBuilder.java b/...esource/XmlResourceItemWriterBuilder.java → ...esource/XmlResourceItemWriterBuilder.java
diff --git a/...t/java/com/redis/riot/file/FileTests.java → ...t/java/com/redis/riot/file/FileTests.java b/...t/java/com/redis/riot/file/FileTests.java → ...t/java/com/redis/riot/file/FileTests.java
diff --git a/...a/com/redis/riot/file/StackFileTests.java → ...a/com/redis/riot/file/StackFileTests.java b/...a/com/redis/riot/file/StackFileTests.java → ...a/com/redis/riot/file/StackFileTests.java
diff --git a/...m/redis/riot/file/XmlItemWriterTests.java → ...m/redis/riot/file/XmlItemWriterTests.java b/...m/redis/riot/file/XmlItemWriterTests.java → ...m/redis/riot/file/XmlItemWriterTests.java
diff --git a/core/riot-file/src/test/resources/beers1.csv → ...s/riot-file/src/test/resources/beers1.csv b/core/riot-file/src/test/resources/beers1.csv → ...s/riot-file/src/test/resources/beers1.csv
diff --git a/core/riot-file/src/test/resources/beers2.csv → ...s/riot-file/src/test/resources/beers2.csv b/core/riot-file/src/test/resources/beers2.csv → ...s/riot-file/src/test/resources/beers2.csv
diff --git a/gradle.properties b/gradle.properties
@@ -16,13 +16,9 @@
 # limitations under the License.
 #
 group                       = com.redis
-sourceCompatibility         = 1.8
-targetCompatibility         = 1.8
-testSourceCompatibility     = 11
-testTargetCompatibility     = 11
 reproducibleBuild           = true
 
-bootPluginVersion           = 2.7.13
+bootPluginVersion           = 2.7.15
 gitPluginVersion            = 3.0.0
 kordampBuildVersion         = 3.1.0
 kordampPluginVersion        = 0.51.0
@@ -31,7 +27,7 @@ awaitilityVersion           = 4.2.0
 awsVersion                  = 2.2.6.RELEASE
 commonsIoVersion            = 2.11.0
 db2Version                  = 11.5.8.0
-datafakerVersion            = 1.9.0
+datafakerVersion            = 2.0.1
 gcpVersion                  = 1.2.8.RELEASE
 googleHttpVersion           = 1.38.0
 jacocoVersion               = 0.8.10
@@ -40,17 +36,17 @@ jsr305Version               = 3.0.2
 latencyutilsVersion         = 2.0.3
 lettucemodVersion           = 3.6.3
 lettuceVersion              = 6.2.6.RELEASE
-mssqlVersion                = 12.2.0.jre8
+mssqlVersion                = 12.4.1.jre11
 oracleVersion               = 19.3.0.0
-picocliVersion              = 4.7.4
+picocliVersion              = 4.7.5
 plexusVersion               = 4.0.0
-progressbarVersion          = 0.9.5
+progressbarVersion          = 0.10.0
 springBatchRedisVersion     = 3.6.6-SNAPSHOT
-sqliteVersion               = 3.42.0.0
+sqliteVersion               = 3.43.0.0
 testcontainersRedisVersion  = 1.6.4
-testcontainersVersion       = 1.18.3
+testcontainersVersion       = 1.19.0
 
-org.gradle.daemon           = false
-org.gradle.caching          = false
+org.gradle.daemon           = true
+org.gradle.caching          = true
 systemProp.file.encoding    = utf-8
 org.gradle.jvmargs          = -Dfile.encoding=UTF-8
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/jreleaser.yml b/jreleaser.yml
@@ -20,7 +20,7 @@ project:
   authors:
     - Julien Ruaux
   license: Apache-2.0
-  inceptionYear: 2020
+  inceptionYear: '2020'
   stereotype: CLI
   vendor: Redis
   icons:
@@ -29,7 +29,7 @@ project:
       height: 256
   java:
     groupId: com.redis
-    version: 17
+    version: '20'
     multiProject: true
     mainClass: com.redis.riot.cli.Main
   tags:
@@ -59,7 +59,7 @@ release:
         format: '- {{contributorName}}{{#contributorUsernameAsLink}} ({{.}}){{/contributorUsernameAsLink}}'
       contentTemplate: 'src/jreleaser/changelog.tpl'
       extraProperties:
-        categorizeScopes: true
+        categorizeScopes: 'true'
       labelers:
         - label: 'i18n'
           title: 'regex:^(?:i18n(?:\(.*\))?!?):\s.*'
@@ -127,7 +127,7 @@ assemble:
     riot-standalone:
       active: ALWAYS
       java:
-        version: 11
+        version: '20'
       imageName: '{{distributionName}}-{{projectEffectiveVersion}}'
       executable: riot
       fileSets:
@@ -245,11 +245,11 @@ distributions:
       - path: plugins/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.zip
         transform: '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.zip'
         extraProperties:
-          skipSpec: true
+          skipSpec: 'true'
       - path: plugins/{{distributionName}}/build/distributions/{{distributionName}}-{{projectVersion}}.tar
         transform: '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.tar'
         extraProperties:
-          skipFlatpak: true
+          skipFlatpak: 'true'
 
   riot-standalone:
     appImage:
@@ -267,6 +267,6 @@ files:
   artifacts:
     - path: VERSION
       extraProperties:
-        skipChecksum: true
-        skipSigning: true
-        skipSbom: true
+        skipChecksum: 'true'
+        skipSigning: 'true'
+        skipSbom: 'true'
diff --git a/settings.gradle b/settings.gradle
@@ -37,7 +37,7 @@ apply plugin: 'org.kordamp.gradle.kordamp-parentbuild'
 rootProject.name = 'riot'
 
 projects {
-    directories = ['core', 'plugins', 'docs']
+    directories = ['core', 'connectors', 'plugins', 'docs']
 
     plugins {
         all {
@@ -50,7 +50,7 @@ projects {
             id 'org.kordamp.gradle.guide'
             id 'org.ajoberstar.git-publish'
         }
-        dirs(['core', 'plugins']) {
+        dirs(['core', 'connectors', 'plugins']) {
             id 'java-library'
             id 'org.springframework.boot'
             id 'io.spring.dependency-management'