Merged dependencies

.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/docker-build.yml

@@ -33,7 +33,7 @@ jobs:
     steps:
       # https://github.com/marketplace/actions/checkout
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK 17
         uses: actions/setup-java@v3
@@ -91,7 +91,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
       # https://github.com/marketplace/actions/build-and-push-docker-images
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4.1.1
+        uses: docker/build-push-action@v4.2.1
         with:
           context: .
           file: docker/${{ matrix.data.image-name }}/Dockerfile

.github/workflows/gradle.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:

.github/workflows/release-upload.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: shared-outputs
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
@@ -58,7 +58,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: shared-outputs
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           repository: 'wildmountainfarms/solarthing-docs'
       - uses: actions/setup-python@v4

.github/workflows/spotless.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:

build.gradle

@@ -28,7 +28,11 @@ buildscript {
 
 
 plugins {
+<<<<<<< HEAD
     id 'com.diffplug.spotless' version '6.22.0' // https://mvnrepository.com/artifact/com.diffplug.spotless/spotless-plugin-gradle
+=======
+    id 'com.diffplug.spotless' version '6.21.0' // https://search.maven.org/search?q=a:spotless-plugin-gradle
+>>>>>>> master
     id 'net.ltgt.errorprone' version "$errorpronePluginVersion"
 }
 

client/build.gradle

@@ -15,14 +15,14 @@ dependencies {
     // for InfluxDB 1.X
     implementation 'org.influxdb:influxdb-java:2.23'
     // for InfluxDB 2.0 // https://github.com/influxdata/influxdb-client-java/releases
-    implementation 'com.influxdb:influxdb-client-java:6.8.0'
+    implementation 'com.influxdb:influxdb-client-java:6.10.0'
 
     implementation "org.apache.logging.log4j:log4j-core:$log4jVersion" // used for our custom error handler, otherwise not a necessary dependency
     implementation "org.apache.logging.log4j:log4j-jcl:$log4jVersion" // commons logging bridge.
     implementation "org.apache.logging.log4j:log4j-slf4j2-impl:$log4jVersion"
 
     // https://github.com/slackapi/java-slack-sdk/releases
-    implementation 'com.slack.api:slack-api-client:1.29.2'
+    implementation 'com.slack.api:slack-api-client:1.31.0'
     // https://mvnrepository.com/artifact/org.java-websocket/Java-WebSocket
     implementation 'org.java-websocket:Java-WebSocket:1.5.4'
 
@@ -36,7 +36,7 @@ dependencies {
     implementation 'info.debatty:java-string-similarity:2.0.0'
 
     // TODO do we need this dependency?
-    implementation group: 'biz.paluch.logging', name: 'logstash-gelf', version: '1.15.0'
+    implementation group: 'biz.paluch.logging', name: 'logstash-gelf', version: '1.15.1'
 
 }