Merge remote-tracking branch 'origin/dev' into dev

Author: BFergerson

README.md

@@ -1,6 +1,6 @@
 # ![](https://github.com/sourceplusplus/live-platform/blob/master/.github/media/sourcepp_logo.svg)
 
-[![License](https://img.shields.io/github/license/sourceplusplus/probe-jvm)](LICENSE)
+[![License](https://camo.githubusercontent.com/93398bf31ebbfa60f726c4f6a0910291b8156be0708f3160bad60d0d0e1a4c3f/68747470733a2f2f696d672e736869656c64732e696f2f6769746875622f6c6963656e73652f736f75726365706c7573706c75732f6c6976652d706c6174666f726d)](LICENSE)
 ![GitHub release](https://img.shields.io/github/v/release/sourceplusplus/probe-jvm?include_prereleases)
 [![Build](https://github.com/sourceplusplus/probe-jvm/actions/workflows/build.yml/badge.svg)](https://github.com/sourceplusplus/probe-jvm/actions/workflows/build.yml)
 
@@ -12,7 +12,7 @@ This project provides JVM support to the [Source++](https://github.com/sourceplu
 
 ## Standalone Agent
 
-1. Add `spp-probe-*.jar`& `spp-probe.yml` to the same directory
+1. Add `spp-probe-*.jar` and `spp-probe.yml` to the same directory
     - E.g. [spp-probe-0.4.2.jar](https://github.com/sourceplusplus/probe-jvm/releases/download/0.4.2/spp-probe-0.4.2.jar) & [spp-probe.yml](https://docs.sourceplusplus.com/implementation/tools/probe/configuration/)
 1. Boot application with `-javaagent:spp-probe-*.jar` parameter
     - E.g. `java -javaagent:/opt/spp-platform/spp-probe-0.4.2.jar -jar MyApp.jar`

services/build.gradle.kts

@@ -26,7 +26,7 @@ dependencies {
 
     //implementation("com.google.code.gson:gson:$gsonVersion")
     implementation(files("../.ext/gson-2.8.6-SNAPSHOT.jar"))
-    implementation("org.springframework:spring-expression:5.3.16")
+    implementation("org.springframework:spring-expression:5.3.17")
     implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")
     implementation("org.jetbrains:annotations:23.0.0")
     testImplementation("junit:junit:4.13.2")

settings.gradle

@@ -2,7 +2,7 @@ pluginManagement {
     plugins {
         String kotlinVersion = "1.6.10"
         id 'org.jetbrains.kotlin.jvm' version kotlinVersion apply false
-        id 'com.avast.gradle.docker-compose' version "0.15.1" apply false
+        id 'com.avast.gradle.docker-compose' version "0.15.2" apply false
         id 'io.gitlab.arturbosch.detekt' version "1.19.0" apply false
         id 'com.github.johnrengelman.shadow' version "7.1.2" apply false
         id 'com.diffplug.spotless' version '6.3.0' apply false