Skip to content

Commit 7fc21d3

Browse files
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents afa975e + b60ea78 commit 7fc21d3

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ This project provides JVM support to the [Source++](https://github.com/sourceplu
1313
## Standalone Agent
1414

1515
1. Add `spp-probe-*.jar`& `spp-probe.yml` to the same directory
16-
- E.g. [spp-probe-0.3.1.jar](https://github.com/sourceplusplus/probe-jvm/releases/download/0.3.1/spp-probe-0.3.1.jar) & [spp-probe.yml](https://docs.sourceplusplus.com/implementation/tools/probe/configuration/)
16+
- E.g. [spp-probe-0.4.1.jar](https://github.com/sourceplusplus/probe-jvm/releases/download/0.4.1/spp-probe-0.4.1.jar) & [spp-probe.yml](https://docs.sourceplusplus.com/implementation/tools/probe/configuration/)
1717
1. Boot application with `-javaagent:spp-probe-*.jar` parameter
18-
- E.g. `java -javaagent:/opt/spp-platform/spp-probe-0.3.1.jar -jar MyApp.jar`
18+
- E.g. `java -javaagent:/opt/spp-platform/spp-probe-0.4.1.jar -jar MyApp.jar`
1919

2020
## Apache SkyWalking Plugin
2121

2222
1. Add `spp-probe-*.jar` and `spp-skywalking-services-*.jar` to `skywalking-agent/plugins` directory
23-
- E.g. [spp-probe-0.3.1.jar](https://github.com/sourceplusplus/probe-jvm/releases/download/0.3.1/spp-probe-0.3.1.jar) & [spp-skywalking-services-0.3.1.jar](https://github.com/sourceplusplus/probe-jvm/releases/download/0.3.1/spp-skywalking-services-0.3.1.jar)
23+
- E.g. [spp-probe-0.4.1.jar](https://github.com/sourceplusplus/probe-jvm/releases/download/0.4.1/spp-probe-0.4.1.jar) & [spp-skywalking-services-0.4.1.jar](https://github.com/sourceplusplus/probe-jvm/releases/download/0.4.1/spp-skywalking-services-0.4.1.jar)
2424
1. Add `spp-probe.yml` to `skywalking-agent/config` directory
2525
- E.g. [spp-probe.yml](https://docs.sourceplusplus.com/implementation/tools/probe/configuration/)
2626
1. Reboot Apache SkyWalking agent

services/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626

2727
//implementation("com.google.code.gson:gson:$gsonVersion")
2828
implementation(files("../.ext/gson-2.8.6-SNAPSHOT.jar"))
29-
implementation("org.springframework:spring-expression:5.3.15")
29+
implementation("org.springframework:spring-expression:5.3.16")
3030
implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")
3131
implementation("org.jetbrains:annotations:23.0.0")
3232
testImplementation("junit:junit:4.13.2")

settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ pluginManagement {
22
plugins {
33
String kotlinVersion = "1.6.10"
44
id 'org.jetbrains.kotlin.jvm' version kotlinVersion apply false
5-
id 'com.avast.gradle.docker-compose' version "0.15.0" apply false
5+
id 'com.avast.gradle.docker-compose' version "0.15.1" apply false
66
id 'io.gitlab.arturbosch.detekt' version "1.19.0" apply false
77
id 'com.github.johnrengelman.shadow' version "7.1.2" apply false
88
id 'com.diffplug.spotless' version '6.3.0' apply false

0 commit comments

Comments
 (0)