diff --git a/build.gradle b/build.gradle index b41ac93..499c8b6 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ subprojects { apply plugin: 'groovy' dependencies { - testImplementation 'org.spockframework:spock-core:2.1-groovy-3.0' + testImplementation "org.spockframework:spock-core:${spockVersion}" testImplementation "org.slf4j:slf4j-api:${slf4jVersion}" testImplementation "org.slf4j:slf4j-simple:${slf4jVersion}" diff --git a/client/doc/readme-redhat.md b/client/doc/readme-redhat.md index 0731b43..deb29c9 100644 --- a/client/doc/readme-redhat.md +++ b/client/doc/readme-redhat.md @@ -23,7 +23,7 @@ Use *yum* if *dnf* is not available. ```shell wget https://bitbucket.org/mnellemann/sysmon/downloads/sysmon-client-1.0.16-1.noarch.rpm wget https://bitbucket.org/mnellemann/sysmon/downloads/sysmon-plugins-1.0.16-1.noarch.rpm -rpm -Ivh sysmon-client-*.noarch.rpm sysmon-plugins-*.noarch.rpm +rpm -ivh sysmon-client-*.noarch.rpm sysmon-plugins-*.noarch.rpm cp /opt/sysmon/client/doc/sysmon-client.service /etc/systemd/system/ systemctl daemon-reload ``` diff --git a/client/doc/sysmon-client.sh b/client/doc/sysmon-client.sh index 6760a5d..8815a36 100644 --- a/client/doc/sysmon-client.sh +++ b/client/doc/sysmon-client.sh @@ -21,6 +21,7 @@ stderr_log="/var/log/$name.err" # Uncomment if required #JAVA_HOME=/usr/java8_64 +#JAVA_HOME=/opt/ibm/ibm-semeru-certified-11-jre #export JAVA_HOME get_pid() { diff --git a/client/src/main/java/sysmon/client/Application.java b/client/src/main/java/sysmon/client/Application.java index c7c2111..ceb1b74 100644 --- a/client/src/main/java/sysmon/client/Application.java +++ b/client/src/main/java/sysmon/client/Application.java @@ -4,7 +4,7 @@ package sysmon.client; import org.apache.camel.main.Main; -import org.slf4j.impl.SimpleLogger; +import org.slf4j.simple.SimpleLogger; import picocli.CommandLine; import java.io.File; diff --git a/gradle.properties b/gradle.properties index 3a76067..274e613 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,8 @@ -version = 1.0.16 +version = 1.0.17 pf4jVersion = 3.7.0 -slf4jVersion = 1.7.36 +slf4jVersion = 2.0.0 camelVersion = 3.14.5 groovyVersion = 3.0.12 picocliVersion = 4.6.3 oshiVersion = 6.2.2 +spockVersion = 2.2-groovy-3.0 diff --git a/plugins/build.gradle b/plugins/build.gradle index 45703e2..b2d4f24 100644 --- a/plugins/build.gradle +++ b/plugins/build.gradle @@ -10,7 +10,7 @@ subprojects { apply plugin: 'groovy' dependencies { - testImplementation 'org.spockframework:spock-core:2.1-groovy-3.0' + testImplementation "org.spockframework:spock-core:${spockVersion}" testImplementation "org.slf4j:slf4j-api:${slf4jVersion}" testImplementation "org.slf4j:slf4j-simple:${slf4jVersion}" testImplementation project(':shared') diff --git a/server/doc/sysmon-server.sh b/server/doc/sysmon-server.sh index 32b5aca..c677bcc 100644 --- a/server/doc/sysmon-server.sh +++ b/server/doc/sysmon-server.sh @@ -21,6 +21,7 @@ stderr_log="/var/log/$name.err" # Uncomment if required #JAVA_HOME=/usr/java8_64 +#JAVA_HOME=/opt/ibm/ibm-semeru-certified-11-jre #export JAVA_HOME get_pid() { diff --git a/server/src/main/java/sysmon/server/Application.java b/server/src/main/java/sysmon/server/Application.java index 9f80a0b..aec07a2 100644 --- a/server/src/main/java/sysmon/server/Application.java +++ b/server/src/main/java/sysmon/server/Application.java @@ -3,7 +3,7 @@ package sysmon.server; import org.apache.camel.main.Main; import org.influxdb.InfluxDB; import org.influxdb.InfluxDBFactory; -import org.slf4j.impl.SimpleLogger; +import org.slf4j.simple.SimpleLogger; import picocli.CommandLine; import java.io.IOException; diff --git a/shared/build.gradle b/shared/build.gradle index 307e9f0..b115439 100644 --- a/shared/build.gradle +++ b/shared/build.gradle @@ -18,7 +18,7 @@ repositories { dependencies { testImplementation "org.codehaus.groovy:groovy:${groovyVersion}" - testImplementation "org.spockframework:spock-core:2.0-groovy-3.0" + testImplementation "org.spockframework:spock-core:${spockVersion}" testImplementation "junit:junit:4.13.2" testImplementation "org.slf4j:slf4j-api:${slf4jVersion}" @@ -27,7 +27,6 @@ dependencies { //annotationProcessor(group: 'org.pf4j', name: 'pf4j', version: "${pf4jVersion}") implementation group: 'org.pf4j', name: 'pf4j', version: "${pf4jVersion}" - } tasks.named('test') {