From a349824b6fd6bc264016d2bfb696425f14ff401e Mon Sep 17 00:00:00 2001 From: Lavender Shannon Date: Sun, 22 Oct 2023 14:59:33 -0500 Subject: [PATCH] Added mailmap and dependency updates --- .mailmap | 2 ++ build.gradle | 4 ++-- client/build.gradle | 2 +- server/build.gradle | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 00000000..72155314 --- /dev/null +++ b/.mailmap @@ -0,0 +1,2 @@ +# https://git-scm.com/docs/gitmailmap +Lavender Shannon diff --git a/build.gradle b/build.gradle index f5432ba1..29e8a80b 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { dockerComposePluginVersion = "0.17.4" // https://github.com/avast/gradle-docker-compose-plugin/releases errorpronePluginVersion = '3.1.0' // https://github.com/tbroyer/gradle-errorprone-plugin/releases errorproneCoreVersion = '2.21.1' // https://mvnrepository.com/artifact/com.google.errorprone/error_prone_core - antlrVersion = "4.13.0" // https://github.com/antlr/antlr4/releases + antlrVersion = "4.13.1" // https://github.com/antlr/antlr4/releases } dependencies { classpath "com.avast.gradle:gradle-docker-compose-plugin:$dockerComposePluginVersion" @@ -28,7 +28,7 @@ buildscript { plugins { - id 'com.diffplug.spotless' version '6.21.0' // https://mvnrepository.com/artifact/com.diffplug.spotless/spotless-plugin-gradle + id 'com.diffplug.spotless' version '6.22.0' // https://mvnrepository.com/artifact/com.diffplug.spotless/spotless-plugin-gradle id 'net.ltgt.errorprone' version "$errorpronePluginVersion" } diff --git a/client/build.gradle b/client/build.gradle index a644a7f3..39d2645e 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -24,7 +24,7 @@ dependencies { // https://github.com/slackapi/java-slack-sdk/releases implementation 'com.slack.api:slack-api-client:1.29.2' // https://mvnrepository.com/artifact/org.java-websocket/Java-WebSocket - implementation 'org.java-websocket:Java-WebSocket:1.5.3' + implementation 'org.java-websocket:Java-WebSocket:1.5.4' // https://mvnrepository.com/artifact/com.lexicalscope.jewelcli/jewelcli implementation group: 'com.lexicalscope.jewelcli', name: 'jewelcli', version: '0.8.9' diff --git a/server/build.gradle b/server/build.gradle index 914e59af..3f2d515e 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { // https://github.com/spring-projects/spring-boot/wiki#release-notes // https://github.com/spring-projects/spring-boot/releases - springBootVersion = '3.1.1' + springBootVersion = '3.1.5' } repositories { mavenCentral()