diff --git a/build_package.sh b/build_package.sh index 70781efda..bd169e607 100755 --- a/build_package.sh +++ b/build_package.sh @@ -4,17 +4,38 @@ # download ant from : # https://ant.apache.org -MVN="`which mvn`" +MVN="$(which mvn)" if [ ! -z "${MAVEN_HOME}" ]; then - echo MAVEN_HOME: ${MAVEN_HOME} - MVN="${MAVEN_HOME}/bin/mvn" + echo MAVEN_HOME: ${MAVEN_HOME} + MVN="${MAVEN_HOME}/bin/mvn" fi if [ -z "$MVN" ]; then - echo maven not found. - exit 1 -else + echo "maven not found." + exit 1 +fi + +# Get Java Major Version +JAVA_VER=$(java -version 2>&1 | head -1 | cut -d'"' -f2 | sed '/^1\./s///' | cut -d'.' -f1) +echo "Detected Java Major Version: $JAVA_VER" + +if [ -z "$JAVA_VER" ]; then + echo "Java is not installed or not in PATH." + exit 1 +fi + +if [ "$JAVA_VER" -ge 8 ]; then + echo "JDK 8+ detected. Building java-8-plus profile" $MVN -Dmaven.test.skip=true clean install - $MVN -Dmaven.test.skip=true -f ./scouter.agent.java/pom.xml -Pjava-21-plus clean package - $MVN -Dmaven.test.skip=true -f ./scouter.deploy/pom.xml clean package + $MVN -Dmaven.test.skip=true -f ./scouter.agent.java/pom.xml -Pjava-8-plus package +else + echo "Scouter requires at least JDK 8." + exit 1 fi + +if [ "$JAVA_VER" -ge 21 ]; then + echo "JDK 21+ detected. Building java-21-plus profile" + $MVN -Dmaven.test.skip=true -f ./scouter.agent.java/pom.xml -Pjava-21-plus package +fi + +$MVN -Dmaven.test.skip=true -f ./scouter.deploy/pom.xml clean package \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3e223eff9..9bf94c30c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 io.github.scouter-project scouter-parent - 2.21.3 + 2.21.4 pom SCOUTER APM @@ -22,41 +24,9 @@ scouter.agent.host scouter.agent.java scouter.agent.batch - scouter.extra.java20 scouter.extra.java20dummy - - scouter-host-agent-assembly - scouter-java-agent-assembly - scouter-batch-agent-assembly - scouter-server-assembly - scouter-webapp-assembly - - ${project.basedir}/../target/whole-pack-working - agent.java_6_7 - - scouter-all-${project.version} - scouter-min-${project.version} - - 9.4.6.v20170531 - 2.27 - 1.7.25 - 1.2.13 - - - - - - - - - - - - - - The Apache Software License, Version 2.0 @@ -92,21 +62,411 @@ HEAD + + UTF-8 + + yyyy-MM-dd HH:mm + ${maven.build.timestamp} GMT + + ${project.basedir}/../target/whole-pack-working + agent.java_6_7 + + scouter-host-agent-assembly + scouter-java-agent-assembly + scouter-batch-agent-assembly + scouter-server-assembly + scouter-webapp-assembly + + scouter-all-${project.version} + scouter-min-${project.version} + + 9.4.56.v20240826 + 2.44 + 1.7.25 + 1.2.13 + 1.6.14 + + + + + java-8-plus + + 1.8 + true + + + 1.8 + 1.8 + + + + + java-21-plus + + [21,) + + + 21 + 21 + true + + + scouter.extra.java20 + + + + + + + + io.github.scouter-project + scouter-common + ${project.version} + + + io.github.scouter-project + scouter-server + ${project.version} + + + io.github.scouter-project + scouter-webapp + ${project.version} + + + io.github.scouter-project + scouter-extra-java20 + ${project.version} + + + io.github.scouter-project + scouter-extra-java20dummy + ${project.version} + + + + org.projectlombok + lombok + 1.18.32 + + + org.slf4j + slf4j-api + ${slf4j.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + org.apache.commons + commons-lang3 + 3.6 + + + commons-collections + commons-collections + 3.2.2 + + + + org.ow2.asm + asm + 9.8 + + + org.ow2.asm + asm-commons + 9.8 + + + com.github.oshi + oshi-core + 6.3.1 + + + org.javassist + javassist + 3.29.2-GA + + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + + + org.eclipse.jetty.websocket + javax-websocket-server-impl + ${jetty.version} + + + org.glassfish.jersey.containers + jersey-container-servlet-core + ${jersey.version} + + + org.glassfish.jersey.inject + jersey-hk2 + ${jersey.version} + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey.version} + + + org.glassfish.jersey.ext + jersey-bean-validation + ${jersey.version} + + + io.swagger + swagger-jersey2-jaxrs + ${swagger.version} + + + javax.validation + validation-api + 2.0.1.Final + + + org.hibernate.validator + hibernate-validator + 6.2.3.Final + + + + com.fasterxml.jackson.core + jackson-core + 2.15.4 + + + com.fasterxml.jackson.core + jackson-databind + 2.15.4 + + + + javax.xml.bind + jaxb-api + 2.3.1 + + + org.glassfish.jaxb + jaxb-runtime + 2.3.9 + + + javax.activation + activation + 1.1.1 + + + + org.scala-lang + scala-library + 2.13.18 + + + org.scala-lang + scala-reflect + 2.13.18 + + + org.scala-lang + scala-compiler + 2.13.18 + + + org.scala-lang + jline + 2.10.6 + + + + javax.servlet + javax.servlet-api + 3.1.0 + + + jakarta.servlet + jakarta.servlet-api + 5.0.0 + + + org.apache.httpcomponents + httpclient + 4.5.13 + + + org.apache.httpcomponents + httpcore + 4.3.3 + + + org.apache.httpcomponents.core5 + httpcore5 + 5.2.1 + + + org.apache.httpcomponents.client5 + httpclient5 + 5.2.1 + + + org.springframework + spring-core + 5.3.39 + + + org.springframework + spring-web + 5.3.39 + + + org.springframework + spring-webflux + 5.3.39 + + + io.projectreactor + reactor-core + 3.4.39 + + + org.apache.kafka + kafka-clients + 0.10.1.0 + + + org.elasticsearch.client + elasticsearch-rest-client + 6.8.10 + + + org.mongodb + mongodb-driver-core + 4.0.5 + + + io.lettuce + lettuce-core + 5.0.2.RELEASE + + + org.redisson + redisson + 3.17.7 + + + org.redisson + redisson-spring-data-27 + 3.17.7 + + + com.netflix.ribbon + ribbon-loadbalancer + 2.0.0 + + + io.reactivex + rxnetty + 0.4.6 + + + org.jetbrains.kotlinx + kotlinx-coroutines-reactor + 1.5.2 + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + 1.5.31 + + + com.github.jsqlparser + jsqlparser + 0.9.4 + + + com.maxmind.geoip + geoip-api + 1.3.1 + + + com.googlecode.json-simple + json-simple + 1.1.1 + + + + junit + junit + 4.13.1 + + + org.assertj + assertj-core + 3.8.0 + + + org.mockito + mockito-all + 1.10.19 + + + org.powermock + powermock-module-junit4 + 1.7.3 + + + org.powermock + powermock-api-mockito + 1.7.3 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + + -parameters + + + + org.projectlombok + lombok + 1.18.32 + + + + org.apache.maven.plugins maven-surefire-plugin - 2.12.1 + 3.2.5 true - + org.apache.maven.plugins maven-source-plugin - 3.0.1 + 3.3.0 attach-sources @@ -119,8 +479,10 @@ org.apache.maven.plugins maven-javadoc-plugin + 3.6.3 - -Xdoclint:none + none + false @@ -134,7 +496,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + 3.2.4 sign-artifacts @@ -145,8 +507,35 @@ + + + org.apache.maven.plugins + maven-shade-plugin + 3.5.2 + + + org.apache.maven.plugins + maven-antrun-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + org.apache.maven.plugins + maven-dependency-plugin + 3.6.1 + + + net.alchim31.maven + scala-maven-plugin + 4.8.1 + + org.apache.maven.plugins @@ -155,7 +544,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 org.apache.maven.plugins @@ -164,7 +552,7 @@ org.sonatype.central central-publishing-maven-plugin - 0.9.0 + 0.4.0 true central @@ -173,4 +561,4 @@ - + \ No newline at end of file diff --git a/scouter.agent.batch/pom.xml b/scouter.agent.batch/pom.xml index 9f498def6..bd7a74cee 100644 --- a/scouter.agent.batch/pom.xml +++ b/scouter.agent.batch/pom.xml @@ -1,11 +1,13 @@ - + + 4.0.0 io.github.scouter-project scouter-parent - 2.21.3 + 2.21.4 scouter-agent-batch @@ -13,14 +15,10 @@ scouter.agent.batch - yyyy-MM-dd HH:mm - ${maven.build.timestamp} GMT - UTF-8 ${project.build.directory}/assembly-working ${project.build.directory}/${project.build.finalName}.jar scouter.agent.batch.jar scouter.tools.jar - ${project.basedir}/lib/provided/tools.jar @@ -28,17 +26,14 @@ org.ow2.asm asm - 7.0 org.ow2.asm asm-commons - 7.0 - + io.github.scouter-project scouter-common - ${project.version} jdk.tools @@ -47,16 +42,15 @@ system ${provided.tools.jar} + junit junit - 4.13.1 test org.assertj assertj-core - 2.3.0 test @@ -66,17 +60,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 - - 1.6 - 1.6 - 1.6 - org.apache.maven.plugins maven-jar-plugin - 3.0.2 @@ -95,7 +82,6 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.0 package @@ -120,11 +106,13 @@ org.apache.maven.plugins maven-antrun-plugin - 1.8 make-ext-jar package + + run + @@ -134,70 +122,71 @@ - - run - - + make-assembly package + + run + - - + - + - - - - - + + + + + - + - + - + - - - - + + + + - + - + - + - - + + - - - + + - - run - - - + \ No newline at end of file diff --git a/scouter.agent.host/pom.xml b/scouter.agent.host/pom.xml index efc3f9f67..b11bd22ce 100644 --- a/scouter.agent.host/pom.xml +++ b/scouter.agent.host/pom.xml @@ -1,10 +1,13 @@ - + + 4.0.0 io.github.scouter-project scouter-parent - 2.21.3 + 2.21.4 scouter-agent-host @@ -12,23 +15,18 @@ scouter.agent.host - yyyy-MM-dd HH:mm - ${maven.build.timestamp} GMT scouter.host.jar ${project.build.directory}/assembly-working - UTF-8 io.github.scouter-project scouter-common - ${project.version} com.github.oshi oshi-core - 6.3.1 @@ -40,20 +38,9 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - 1.8 - - org.apache.maven.plugins maven-jar-plugin - 3.0.2 @@ -63,7 +50,6 @@ org.apache.maven.plugins maven-shade-plugin - 2.4.3 package @@ -90,11 +76,13 @@ org.apache.maven.plugins maven-antrun-plugin - 1.8 make-boot-jar package + + run + @@ -110,13 +98,13 @@ - - run - make-assembly package + + run + @@ -125,8 +113,10 @@ - - + + @@ -141,18 +131,15 @@ - - + - - run - - - + \ No newline at end of file diff --git a/scouter.agent.java/pom.xml b/scouter.agent.java/pom.xml index 76085e9df..94ec3bd0b 100644 --- a/scouter.agent.java/pom.xml +++ b/scouter.agent.java/pom.xml @@ -1,70 +1,51 @@ - + + 4.0.0 io.github.scouter-project scouter-parent - 2.21.3 + 2.21.4 scouter-agent-java jar scouter.agent.java - java-8-plus + 1.8 true java8plus - 1.8 ${scouter.agent.java.assembly.name} io.github.scouter-project scouter-extra-java20dummy - ${project.version} - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - ${java.version} - ${java.version} - ${java.version} - true - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.5.0 - - - - - + java-21-plus + + [21,) + java21plus - 21 ${scouter.agent.java.assembly.name}.java21 io.github.scouter-project scouter-extra-java20 - ${project.version} @@ -72,13 +53,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 - ${java.version} - ${java.version} - ${java.version} - true - ${env.JAVA_21_HOME}/bin/javac --add-exports java.base/sun.net.www.http=ALL-UNNAMED @@ -87,24 +62,12 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - 3.5.0 - - ${env.JAVA_21_HOME}/bin/javadoc - - - yyyy-MM-dd HH:mm - ${maven.build.timestamp} GMT - - UTF-8 scouter.http.jar scouter.jdbc.jar scouter.httpclient.jar @@ -121,8 +84,6 @@ ${project.build.directory}/shade-${project.build.finalName}.jar scouter.agent.jar scouter.agent.min.jar - - ${project.basedir}/lib/provided/tools.jar @@ -136,7 +97,6 @@ org.apache.maven.plugins maven-jar-plugin - 3.0.2 @@ -154,25 +114,9 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - ${java.version} - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.5.0 - org.apache.maven.plugins maven-shade-plugin - 3.5.1 package @@ -209,11 +153,13 @@ org.apache.maven.plugins maven-antrun-plugin - 1.8 make-ext-jar package + + run + @@ -259,13 +205,13 @@ - - run - add-to-uber-jar package + + run + @@ -285,16 +231,21 @@ - - + + - + - - + + @@ -304,42 +255,48 @@ - - + - - + + - + - - - + + - - + + - + - - - run - make-assembly package + + run + - + @@ -352,14 +309,12 @@ - - + - - run - @@ -370,25 +325,20 @@ io.github.scouter-project scouter-common - ${project.version} org.ow2.asm asm - 9.8 org.ow2.asm asm-commons - 9.8 org.javassist javassist - 3.29.2-GA - jdk.tools jdk.tools @@ -404,72 +354,59 @@ ${java.net.http.jar} - javax.servlet javax.servlet-api - 3.1.0 provided jakarta.servlet jakarta.servlet-api - 5.0.0 provided - org.apache.httpcomponents httpclient - 4.5.13 provided org.apache.httpcomponents httpcore - 4.3.3 provided org.apache.httpcomponents.core5 httpcore5 - 5.2.1 provided org.apache.httpcomponents.client5 httpclient5 - 5.2.1 provided com.netflix.ribbon ribbon-loadbalancer - 2.0.0 provided io.reactivex rxnetty - 0.4.6 provided org.springframework spring-core - 5.2.8.RELEASE provided org.springframework spring-web - 5.2.8.RELEASE provided org.springframework spring-webflux - 5.2.8.RELEASE provided @@ -481,70 +418,53 @@ org.jetbrains.kotlinx kotlinx-coroutines-reactor - 1.5.2 provided org.jetbrains.kotlin kotlin-stdlib-jdk8 - 1.5.31 provided org.apache.kafka kafka-clients - 0.10.1.0 provided org.elasticsearch.client elasticsearch-rest-client - 6.8.10 provided org.mongodb mongodb-driver-core - 4.0.5 provided - io.lettuce lettuce-core - 5.0.2.RELEASE provided org.redisson redisson - 3.17.7 provided org.redisson redisson-spring-data-27 - 3.17.7 provided - junit junit - 4.13.1 test org.assertj assertj-core - 2.3.0 test - - - - - - + \ No newline at end of file diff --git a/scouter.client.build/pom.xml b/scouter.client.build/pom.xml index cb293d8e9..c00d37848 100644 --- a/scouter.client.build/pom.xml +++ b/scouter.client.build/pom.xml @@ -1,7 +1,7 @@ - - + + 4.0.0 scouter.client scouter.client.parent @@ -16,13 +16,13 @@ 5.0.1 UTF-8 - - - eclipse-2025-12 - p2 - https://download.eclipse.org/releases/2025-12/ - - + + + eclipse-2025-12 + p2 + https://download.eclipse.org/releases/2025-12/ + + @@ -33,16 +33,16 @@ ${tycho-version} true - - org.eclipse.tycho - target-platform-configuration - ${tycho-version} - - - - win32 - win32 - x86_64 + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + win32 + win32 + x86_64 linux @@ -65,7 +65,9 @@ - + org.eclipse.m2e lifecycle-mapping @@ -83,7 +85,7 @@ - + @@ -98,7 +100,7 @@ - + @@ -115,7 +117,7 @@ - + @@ -128,7 +130,7 @@ - + @@ -138,4 +140,4 @@ - + \ No newline at end of file diff --git a/scouter.client.feature/pom.xml b/scouter.client.feature/pom.xml index 2d2984876..0c3be919a 100644 --- a/scouter.client.feature/pom.xml +++ b/scouter.client.feature/pom.xml @@ -1,16 +1,16 @@ - 4.0.0 scouter.client.feature eclipse-feature - + - ../scouter.client.build/pom.xml - scouter.client - scouter.client.parent - 1.0.0-SNAPSHOT + ../scouter.client.build/pom.xml + scouter.client + scouter.client.parent + 1.0.0-SNAPSHOT \ No newline at end of file diff --git a/scouter.client.product/pom.xml b/scouter.client.product/pom.xml index f196fd0d0..0eecc6673 100644 --- a/scouter.client.product/pom.xml +++ b/scouter.client.product/pom.xml @@ -1,19 +1,19 @@ - + 4.0.0 scouter.client.product eclipse-repository - + ../scouter.client.build/pom.xml scouter.client scouter.client.parent 1.0.0-SNAPSHOT - + @@ -74,21 +74,25 @@ + todir="${project.build.directory}/products/scouter.client.product/macosx/cocoa/x86_64/scouter.client" + failonerror="false" /> + todir="${project.build.directory}/products/scouter.client.product/macosx/cocoa/x86_64/scouter.client" + failonerror="false" /> + todir="${project.build.directory}/products/scouter.client.product/macosx/cocoa/aarch64/scouter.client" + failonerror="false" /> + todir="${project.build.directory}/products/scouter.client.product/macosx/cocoa/aarch64/scouter.client" + failonerror="false" /> - - + + @@ -96,4 +100,4 @@ - + \ No newline at end of file diff --git a/scouter.client/pom.xml b/scouter.client/pom.xml index 5627e719d..dc0566c71 100644 --- a/scouter.client/pom.xml +++ b/scouter.client/pom.xml @@ -1,29 +1,29 @@ - - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - scouter.client - eclipse-plugin - - - ../scouter.client.build/pom.xml - scouter.client - scouter.client.parent - 1.0.0-SNAPSHOT - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 21 - 21 - - - - - + scouter.client + eclipse-plugin + + + ../scouter.client.build/pom.xml + scouter.client + scouter.client.parent + 1.0.0-SNAPSHOT + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 21 + 21 + + + + + \ No newline at end of file diff --git a/scouter.common/pom.xml b/scouter.common/pom.xml index 142932bac..dcc2ad335 100644 --- a/scouter.common/pom.xml +++ b/scouter.common/pom.xml @@ -1,22 +1,19 @@ - + + 4.0.0 io.github.scouter-project scouter-parent - 2.21.3 + 2.21.4 scouter-common jar scouter.common - - yyyy-MM-dd HH:mm - ${maven.build.timestamp} GMT - UTF-8 - - @@ -25,19 +22,9 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - org.apache.maven.plugins maven-shade-plugin - 3.2.0 package @@ -62,20 +49,21 @@ org.apache.maven.plugins maven-antrun-plugin - 1.8 copy-for-client package + + run + - + - - run - @@ -86,14 +74,12 @@ junit junit - 4.13.1 test org.assertj assertj-core - 2.3.0 test - + \ No newline at end of file diff --git a/scouter.deploy/pom.xml b/scouter.deploy/pom.xml index e18f25d89..68035e3b6 100644 --- a/scouter.deploy/pom.xml +++ b/scouter.deploy/pom.xml @@ -1,10 +1,11 @@ + 4.0.0 io.github.scouter-project scouter-parent - 2.21.3 + 2.21.4 scouter-deploy @@ -12,10 +13,6 @@ scouter.deploy - yyyy-MM-dd HH:mm - ${maven.build.timestamp} GMT - UTF-8 - ${project.build.directory}/assembly-working ${scouter.assembly.dir}/scouter/agent.java @@ -36,32 +33,50 @@ org.apache.maven.plugins maven-antrun-plugin - 1.8 make-assembly package + + run + - - - - - + + + + + + + + + + + + + + + + + + + + + - - - + + - - + + - + + @@ -73,39 +88,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - run - @@ -142,4 +126,4 @@ - + \ No newline at end of file diff --git a/scouter.extra.java20/pom.xml b/scouter.extra.java20/pom.xml index e0c067b2a..bed17aca9 100644 --- a/scouter.extra.java20/pom.xml +++ b/scouter.extra.java20/pom.xml @@ -1,33 +1,23 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 io.github.scouter-project scouter-parent - 2.21.3 + 2.21.4 - 4.0.0 scouter-extra-java20 jar scouter.agent.extra.java20 - UTF-8 - yyyy-MM-dd HH:mm - ${maven.build.timestamp} GMT - ${project.build.directory}/assembly-working - UTF-8 scouter.weaver - 21 - - - - @@ -35,31 +25,5 @@ true - - - org.apache.maven.plugins - maven-compiler-plugin - 3.6.1 - - 21 - 21 - 21 - true - ${JAVA_21_HOME}/bin/javac - - - - org.apache.maven.plugins - maven-javadoc-plugin - - ${JAVA_21_HOME}/bin/javadoc - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - + \ No newline at end of file diff --git a/scouter.extra.java20dummy/pom.xml b/scouter.extra.java20dummy/pom.xml index 2a65efbed..cce4317f6 100644 --- a/scouter.extra.java20dummy/pom.xml +++ b/scouter.extra.java20dummy/pom.xml @@ -1,22 +1,17 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + io.github.scouter-project scouter-parent - 2.21.3 + 2.21.4 scouter-extra-java20dummy jar scouter.agent.extra.java20dummy - - 8 - 8 - UTF-8 - - - + \ No newline at end of file diff --git a/scouter.server.boot/assembly/scripts/startup.sh b/scouter.server.boot/assembly/scripts/startup.sh index e7973d2af..cf798be55 100755 --- a/scouter.server.boot/assembly/scripts/startup.sh +++ b/scouter.server.boot/assembly/scripts/startup.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash +# Work at JDK9 Above Only +export JDK_JAVA_OPTIONS="--add-opens java.base/java.lang=ALL-UNNAMED" + nohup java -Xmx1024m -classpath ./scouter-server-boot.jar scouter.boot.Boot ./lib > nohup.out & sleep 1 -tail -100 nohup.out - +tail -100 nohup.out \ No newline at end of file diff --git a/scouter.server.boot/assembly/scripts/startup_512m.sh b/scouter.server.boot/assembly/scripts/startup_512m.sh index 7703497c3..927ef0c70 100755 --- a/scouter.server.boot/assembly/scripts/startup_512m.sh +++ b/scouter.server.boot/assembly/scripts/startup_512m.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash +# Work at JDK9 Above Only +export JDK_JAVA_OPTIONS="--add-opens java.base/java.lang=ALL-UNNAMED" + nohup java -Xmx512m -classpath ./scouter-server-boot.jar scouter.boot.Boot ./lib > nohup.out & sleep 1 -tail -100 nohup.out - +tail -100 nohup.out \ No newline at end of file diff --git a/scouter.server.boot/pom.xml b/scouter.server.boot/pom.xml index e6c57b857..fcf3fd88e 100644 --- a/scouter.server.boot/pom.xml +++ b/scouter.server.boot/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 io.github.scouter-project scouter-parent - 2.21.3 + 2.21.4 scouter-server-boot @@ -12,7 +14,6 @@ scouter.server.boot - UTF-8 scouter-server-boot scouter-server-boot.jar ${project.build.directory}/assembly-working @@ -23,26 +24,15 @@ io.github.scouter-project scouter-server - ${project.version} io.github.scouter-project scouter-webapp - ${project.version} - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - org.apache.maven.plugins maven-dependency-plugin @@ -83,7 +73,6 @@ org.apache.maven.plugins maven-antrun-plugin - 1.8 make-assembly @@ -103,11 +92,15 @@ - + - + - + @@ -128,7 +121,9 @@ - + @@ -140,4 +135,4 @@ - + \ No newline at end of file diff --git a/scouter.server/pom.xml b/scouter.server/pom.xml index 65a16b652..1cd8b8a3d 100644 --- a/scouter.server/pom.xml +++ b/scouter.server/pom.xml @@ -1,20 +1,19 @@ - + + 4.0.0 io.github.scouter-project scouter-parent - 2.21.3 - + 2.21.4 scouter-server jar scouter.server - yyyy-MM-dd HH:mm - ${maven.build.timestamp} GMT - UTF-8 ${project.version} @@ -22,99 +21,72 @@ org.scala-lang scala-library - 2.11.12 org.scala-lang scala-reflect - 2.11.12 org.scala-lang scala-compiler - 2.11.12 provided io.github.scouter-project scouter-common - ${project.version} com.github.jsqlparser jsqlparser - 0.9.4 org.javassist javassist - 3.29.2-GA com.maxmind.geoip geoip-api - 1.3.1 org.eclipse.jetty jetty-server - ${jetty.version} org.eclipse.jetty jetty-servlet - ${jetty.version} com.googlecode.json-simple json-simple - 1.1.1 org.apache.httpcomponents httpclient - 4.5.13 javax.xml.bind jaxb-api - 2.3.1 org.glassfish.jaxb jaxb-runtime - 2.3.0 - - - com.sun.xml.bind - jaxb-core - 2.3.0.1 - - - com.sun.xml.bind - jaxb-impl - 2.3.0.1 javax.activation activation - 1.1.1 org.scala-lang jline - 2.10.6 junit junit - 4.13.1 test org.assertj assertj-core - 2.3.0 test @@ -126,31 +98,12 @@ true - - - - net.alchim31.maven - scala-maven-plugin - 3.2.1 - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - 1.8 - - - - net.alchim31.maven scala-maven-plugin - 2.11.12 + 2.13.18 @@ -185,7 +138,6 @@ org.apache.maven.plugins maven-shade-plugin - 2.4.3 package @@ -238,7 +190,6 @@ org.apache.maven.plugins maven-antrun-plugin - 1.8 copy-for-client @@ -246,7 +197,9 @@ - + @@ -257,5 +210,4 @@ - - + \ No newline at end of file diff --git a/scouter.server/src/main/scala/scouter/server/core/AgentManager.scala b/scouter.server/src/main/scala/scouter/server/core/AgentManager.scala index df5841bf3..ba67bbf54 100644 --- a/scouter.server/src/main/scala/scouter/server/core/AgentManager.scala +++ b/scouter.server/src/main/scala/scouter/server/core/AgentManager.scala @@ -33,7 +33,7 @@ import scouter.server.kube.PodSeqManager import scouter.server.netio.AgentCall import java.util.concurrent.ConcurrentHashMap -import scala.collection.JavaConversions._ +import scala.jdk.CollectionConverters._ object AgentManager { private val counterEngine = scouter.server.CounterManager.getInstance().getCounterEngine(); @@ -276,7 +276,7 @@ object AgentManager { } def getObjHashListAsString(objType: String): String = { - return getObjHashList(objType).mkString(",") + return getObjHashList(objType).asScala.mkString(",") } def getObjList(objType: String): List[ObjectPack] = { diff --git a/scouter.server/src/main/scala/scouter/server/core/AlertSummary.scala b/scouter.server/src/main/scala/scouter/server/core/AlertSummary.scala index 94d7da702..78b011baa 100644 --- a/scouter.server/src/main/scala/scouter/server/core/AlertSummary.scala +++ b/scouter.server/src/main/scala/scouter/server/core/AlertSummary.scala @@ -17,7 +17,7 @@ package scouter.server.core; import java.util.HashMap -import scala.collection.JavaConversions.asScalaSet +import scala.jdk.CollectionConverters._ import scouter.lang.SummaryEnum import scouter.lang.pack.AlertPack import scouter.lang.pack.SummaryPack @@ -68,7 +68,7 @@ object AlertSummary { val tm = DateUtil.MILLIS_PER_FIVE_MINUTE val stime = (System.currentTimeMillis() - 10000) / tm * tm - for (ent <- table.entrySet()) { + for (ent <- table.entrySet().asScala) { val sp = new SummaryPack(); sp.time = stime; @@ -83,7 +83,7 @@ object AlertSummary { val levelLv = sp.table.newList("level"); var inx = 0; - for (ent2 <- entSet) { + for (ent2 <- entSet.asScala) { titleLv.add(ent2.getKey()); levelLv.add(ent2.getValue()._1); countLv.add(ent2.getValue()._2); diff --git a/scouter.server/src/main/scala/scouter/server/db/ZipkinSpanRD.scala b/scouter.server/src/main/scala/scouter/server/db/ZipkinSpanRD.scala index beaa6a6aa..1147a35ae 100644 --- a/scouter.server/src/main/scala/scouter/server/db/ZipkinSpanRD.scala +++ b/scouter.server/src/main/scala/scouter/server/db/ZipkinSpanRD.scala @@ -211,8 +211,8 @@ object ZipkinSpanRD { FileUtil.close(reader) } - import scala.collection.JavaConversions._ - spanList.toList + import scala.jdk.CollectionConverters._ + spanList.asScala.toList } } diff --git a/scouter.server/src/main/scala/scouter/server/netio/AgentCall.scala b/scouter.server/src/main/scala/scouter/server/netio/AgentCall.scala index 9fa5c2e2a..d6c8179a6 100644 --- a/scouter.server/src/main/scala/scouter/server/netio/AgentCall.scala +++ b/scouter.server/src/main/scala/scouter/server/netio/AgentCall.scala @@ -74,7 +74,7 @@ object AgentCall { def call(o: ObjectPack, cmd: String, param: MapPack, handler: (Int, DataInputX, DataOutputX) => Unit) { if (o == null) { Logger.println("S503", "Agent Call error. Object pack is null"); - return null; + return; } val tcpAgent = TcpAgentManager.get(o.objHash); if (tcpAgent != null) { diff --git a/scouter.server/src/main/scala/scouter/server/netio/service/handle/AccountService.scala b/scouter.server/src/main/scala/scouter/server/netio/service/handle/AccountService.scala index fd77efed9..136cc5776 100644 --- a/scouter.server/src/main/scala/scouter/server/netio/service/handle/AccountService.scala +++ b/scouter.server/src/main/scala/scouter/server/netio/service/handle/AccountService.scala @@ -30,7 +30,7 @@ import scouter.net.RequestCmd import scouter.net.TcpFlag import scouter.server.account.AccountManager import scouter.server.netio.service.anotation.ServiceHandler -import scala.collection.JavaConversions._ +import scala.jdk.CollectionConverters._ class AccountService { @@ -86,7 +86,7 @@ class AccountService { @ServiceHandler(RequestCmd.LIST_ACCOUNT) def listAccount(din: DataInputX, dout: DataOutputX, login: Boolean) { val accountList = AccountManager.getAccountList(); - accountList.toList.foreach { x => + accountList.asScala.toList.foreach { x => dout.writeByte(TcpFlag.HasNEXT); dout.writeValue(new BlobValue(x.toBytes())); } diff --git a/scouter.server/src/main/scala/scouter/server/netio/service/handle/AgentInfo.scala b/scouter.server/src/main/scala/scouter/server/netio/service/handle/AgentInfo.scala index 956de0db5..b76b3e219 100644 --- a/scouter.server/src/main/scala/scouter/server/netio/service/handle/AgentInfo.scala +++ b/scouter.server/src/main/scala/scouter/server/netio/service/handle/AgentInfo.scala @@ -37,7 +37,7 @@ import scouter.server.db.ObjectRD import scouter.server.netio.AgentCall import scouter.server.netio.service.anotation.ServiceHandler import scouter.util.DateUtil -import scala.collection.JavaConversions._ +import scala.jdk.CollectionConverters._ import java.util.ArrayList import scouter.util.StringUtil import java.util.Enumeration @@ -172,7 +172,7 @@ class AgentInfo { def getFullAgentList(din: DataInputX, dout: DataOutputX, login: Boolean) { val date = DateUtil.yyyymmdd(); val objectList = ObjectRD.getObjectList(date); - for (pack <- objectList) { + for (pack <- objectList.asScala) { val inMemory = AgentManager.getAgent(pack.objHash); if (inMemory == null) { pack.tags.put("status", "dead"); diff --git a/scouter.server/src/main/scala/scouter/server/netio/service/handle/AlertService.scala b/scouter.server/src/main/scala/scouter/server/netio/service/handle/AlertService.scala index e3f8cf350..308e9e44b 100644 --- a/scouter.server/src/main/scala/scouter/server/netio/service/handle/AlertService.scala +++ b/scouter.server/src/main/scala/scouter/server/netio/service/handle/AlertService.scala @@ -20,7 +20,7 @@ package scouter.server.netio.service.handle; import java.util.HashMap -import scala.collection.JavaConversions._ +import scala.jdk.CollectionConverters._ import scouter.io.DataInputX import scouter.io.DataOutputX import scouter.lang.AlertLevel @@ -168,7 +168,7 @@ class AlertService { SummaryRD.readByTime(SummaryEnum.ALERT, date, stime, etime, handler) val keySet = valueMap.keySet(); - for (title <- keySet) { + for (title <- keySet.asScala) { dout.writeByte(TcpFlag.HasNEXT); dout.writePack(valueMap.get(title)); } diff --git a/scouter.server/src/main/scala/scouter/server/netio/service/handle/BatchService.scala b/scouter.server/src/main/scala/scouter/server/netio/service/handle/BatchService.scala index c68eec8f0..05157a230 100644 --- a/scouter.server/src/main/scala/scouter/server/netio/service/handle/BatchService.scala +++ b/scouter.server/src/main/scala/scouter/server/netio/service/handle/BatchService.scala @@ -38,7 +38,7 @@ import scouter.util.StringKeyLinkedMap.StringKeyLinkedEntry import scouter.server.util.EnumerScala import scouter.server.db.BatchDB import scouter.server.db.BatchZipDB -import scala.collection.JavaConversions._ +import scala.jdk.CollectionConverters._ class BatchService { @ServiceHandler(RequestCmd.BATCH_HISTORY_LIST) @@ -107,7 +107,7 @@ class BatchService { return ; } val agentList = AgentManager.getLiveObjHashList(objType); - for (agent <- agentList) { + for (agent <- agentList.asScala) { val o = AgentManager.getAgent(agent); val p = AgentCall.call(o, RequestCmd.OBJECT_BATCH_ACTIVE_LIST, param); if (p == null) { diff --git a/scouter.server/src/main/scala/scouter/server/netio/service/handle/CounterService.scala b/scouter.server/src/main/scala/scouter/server/netio/service/handle/CounterService.scala index a0b06acdb..6ad34fe53 100644 --- a/scouter.server/src/main/scala/scouter/server/netio/service/handle/CounterService.scala +++ b/scouter.server/src/main/scala/scouter/server/netio/service/handle/CounterService.scala @@ -32,7 +32,7 @@ import scouter.server.netio.service.anotation.ServiceHandler import scouter.server.util.TimedSeries import scouter.util.{CastUtil, DateUtil, IntKeyMap, StringUtil} -import scala.collection.JavaConversions._ +import scala.jdk.CollectionConverters._ class CounterService { @@ -69,7 +69,7 @@ class CounterService { val instList = mpack.newList("objHash"); val values = mpack.newList("value"); - for (objHash <- insts) { + for (objHash <- insts.asScala) { val key = new CounterKey(objHash.intValue(), counter, TimeTypeEnum.REALTIME); val v = CounterCache.get(key); if (v != null) { @@ -115,7 +115,7 @@ class CounterService { val counters = mpack.newList("counter"); val values = mpack.newList("value"); - for (counter <- cntMap.keySet()) { + for (counter <- cntMap.keySet().asScala) { val value = cntMap.get(counter); counters.add(counter); values.add(value); @@ -132,10 +132,10 @@ class CounterService { val liveObjectList = AgentManager.getLiveObjHashList(objType); val mpack = new MapPack(); - for (objHash <- liveObjectList) { + for (objHash <- liveObjectList.asScala) { val mapValue = new MapValue(); val cntMap = CounterCache.getObjectCounters(objHash.intValue(), TimeTypeEnum.REALTIME); - for (counter <- cntMap.keySet()) { + for (counter <- cntMap.keySet().asScala) { val value = cntMap.get(counter); mapValue.put(counter, value); mpack.put(AgentManager.getAgentName(objHash.intValue()), mapValue); @@ -175,7 +175,7 @@ class CounterService { val counterList = mpack.newList("counter"); val valueList = mpack.newList("value"); - for(objHash <- insts) { + for(objHash <- insts.asScala) { for( i <- 0 to counters.size() - 1) { val key = new CounterKey(objHash, counters.getString(i), TimeTypeEnum.REALTIME); val value = CounterCache.get(key); @@ -204,7 +204,7 @@ class CounterService { var vvv = 0.0; var cnt = 0; val insList = AgentManager.getLiveObjHashList(objType); - for (objHash <- insList) { + for (objHash <- insList.asScala) { val key = new CounterKey(objHash, counter, TimeTypeEnum.REALTIME); val v = CounterCache.get(key); if (v != null) { @@ -396,7 +396,7 @@ class CounterService { while (minTime <= maxTime) { var sum = 0.0d; val list = series.getInTimeList(minTime, 10000); - for (i <- list) { + for (i <- list.asScala) { sum += i; } timeLv.add(minTime); diff --git a/scouter.server/src/main/scala/scouter/server/netio/service/handle/CubridService.scala b/scouter.server/src/main/scala/scouter/server/netio/service/handle/CubridService.scala index b722ea03c..5ef2edabd 100755 --- a/scouter.server/src/main/scala/scouter/server/netio/service/handle/CubridService.scala +++ b/scouter.server/src/main/scala/scouter/server/netio/service/handle/CubridService.scala @@ -47,7 +47,7 @@ import scouter.util.{CastUtil, DateUtil, IntKeyMap, StringUtil} import scouter.server.util.TimedSeries import scouter.server.db.{ObjectRD, RealtimeCounterRD} import scouter.lang.counters.CounterConstants -import scala.collection.JavaConversions._ +import scala.jdk.CollectionConverters._ import scouter.util.HashUtil import scouter.util.DataUtil diff --git a/scouter.server/src/main/scala/scouter/server/netio/service/handle/InteractionCounterService.scala b/scouter.server/src/main/scala/scouter/server/netio/service/handle/InteractionCounterService.scala index 37563f97b..ed66e92a8 100644 --- a/scouter.server/src/main/scala/scouter/server/netio/service/handle/InteractionCounterService.scala +++ b/scouter.server/src/main/scala/scouter/server/netio/service/handle/InteractionCounterService.scala @@ -30,7 +30,7 @@ import scouter.server.netio.service.anotation.ServiceHandler import scouter.server.util.{EnumerScala, TimedSeries} import scouter.util.{CastUtil, DateUtil, IntKeyMap, StringUtil} -import scala.collection.JavaConversions._ +import scala.jdk.CollectionConverters._ class InteractionCounterService { @@ -58,7 +58,7 @@ class InteractionCounterService { } } - for(objHash <- insts) { + for(objHash <- insts.asScala) { val cacheTable = InteractionCounterCache.getCacheTable(objHash) EnumerScala.foreach(cacheTable.values(), (pack: InteractionPerfCounterPack) => { dout.writeByte(TcpFlag.HasNEXT) diff --git a/scouter.server/src/main/scala/scouter/server/netio/service/handle/ServerInfo.scala b/scouter.server/src/main/scala/scouter/server/netio/service/handle/ServerInfo.scala index 1395ad242..128099ad7 100644 --- a/scouter.server/src/main/scala/scouter/server/netio/service/handle/ServerInfo.scala +++ b/scouter.server/src/main/scala/scouter/server/netio/service/handle/ServerInfo.scala @@ -35,7 +35,7 @@ import scouter.net.TcpFlag; import scouter.server.Configure; import scouter.server.netio.service.anotation.ServiceHandler; import scouter.util.FileUtil; -import scala.collection.JavaConversions._ +import scala.jdk.CollectionConverters._ class ServerInfo { @ServiceHandler(RequestCmd.SERVER_STATUS) @@ -65,7 +65,7 @@ class ServerInfo { def getAgentEnv(din: DataInputX, dout: DataOutputX, login: Boolean) { val m = new MapPack(); val p = System.getProperties(); - for (key <- p.keySet()) { + for (key <- p.keySet().asScala) { val value = p.getProperty(key.toString()); m.put(key.toString(), value); } diff --git a/scouter.server/src/main/scala/scouter/server/netio/service/handle/SpecialCounterService.scala b/scouter.server/src/main/scala/scouter/server/netio/service/handle/SpecialCounterService.scala index 96953b53e..d9b7133fc 100644 --- a/scouter.server/src/main/scala/scouter/server/netio/service/handle/SpecialCounterService.scala +++ b/scouter.server/src/main/scala/scouter/server/netio/service/handle/SpecialCounterService.scala @@ -38,7 +38,7 @@ import scouter.server.core.AgentManager import scouter.server.core.cache.CounterCache import scouter.server.netio.service.anotation.ServiceHandler import scouter.util.CastUtil -import scala.collection.JavaConversions._ +import scala.jdk.CollectionConverters._ import scouter.server.util.EnumerScala class SpecialCounterService { @@ -193,7 +193,7 @@ class SpecialCounterService { var v: NumberValue = null; val insList = AgentManager.getLiveObjHashList(objType); - for (ins <- insList) { + for (ins <- insList.asScala) { val ck = new CounterKey(ins, counter, TimeTypeEnum.REALTIME); if (v == null) { v = CounterCache.get(ck).asInstanceOf[NumberValue]; diff --git a/scouter.server/src/main/scala/scouter/server/netio/service/handle/ThreadList.scala b/scouter.server/src/main/scala/scouter/server/netio/service/handle/ThreadList.scala index 620e83e51..3b8897441 100644 --- a/scouter.server/src/main/scala/scouter/server/netio/service/handle/ThreadList.scala +++ b/scouter.server/src/main/scala/scouter/server/netio/service/handle/ThreadList.scala @@ -32,7 +32,7 @@ import scouter.server.core.AgentManager; import scouter.server.netio.AgentCall; import scouter.server.netio.service.anotation.ServiceHandler; import scouter.util.ThreadUtil; -import scala.collection.JavaConversions._ +import scala.jdk.CollectionConverters._ class ThreadList { @@ -95,7 +95,7 @@ class ThreadList { return ; } val agentList = AgentManager.getLiveObjHashList(objType); - for (agent <- agentList) { + for (agent <- agentList.asScala) { val o = AgentManager.getAgent(agent); val p = AgentCall.call(o, RequestCmd.OBJECT_ACTIVE_SERVICE_LIST, param); if (p == null) { diff --git a/scouter.server/src/main/scala/scouter/server/term/handler/DEBUG.scala b/scouter.server/src/main/scala/scouter/server/term/handler/DEBUG.scala index 956f97315..9d0b6dacc 100644 --- a/scouter.server/src/main/scala/scouter/server/term/handler/DEBUG.scala +++ b/scouter.server/src/main/scala/scouter/server/term/handler/DEBUG.scala @@ -28,7 +28,7 @@ import scouter.server.util.ThreadScala import scouter.util.DateUtil import scouter.util.FormatUtil import scouter.util.StringUtil -import scala.collection.JavaConversions._ +import scala.jdk.CollectionConverters._ import scouter.util.IntSet import scouter.server.core.cache.XLogCache import scouter.io.DataInputX diff --git a/scouter.server/src/main/scala/scouter/server/term/handler/Dashboard.scala b/scouter.server/src/main/scala/scouter/server/term/handler/Dashboard.scala index 80a6c04ac..8797d10e4 100644 --- a/scouter.server/src/main/scala/scouter/server/term/handler/Dashboard.scala +++ b/scouter.server/src/main/scala/scouter/server/term/handler/Dashboard.scala @@ -28,7 +28,7 @@ import scouter.server.util.ThreadScala import scouter.util.DateUtil import scouter.util.FormatUtil import scouter.util.StringUtil -import scala.collection.JavaConversions._ +import scala.jdk.CollectionConverters._ import scouter.lang.counters.CounterEngine import scouter.server.CounterManager import java.util.TreeMap diff --git a/scouter.server/src/main/scala/scouter/server/term/handler/REALTIME.scala b/scouter.server/src/main/scala/scouter/server/term/handler/REALTIME.scala index f5fd177a0..6f53352e6 100644 --- a/scouter.server/src/main/scala/scouter/server/term/handler/REALTIME.scala +++ b/scouter.server/src/main/scala/scouter/server/term/handler/REALTIME.scala @@ -29,7 +29,7 @@ import scouter.server.util.ThreadScala import scouter.util.DateUtil import scouter.util.FormatUtil import scouter.util.StringUtil -import scala.collection.JavaConversions._ +import scala.jdk.CollectionConverters._ object REALTIME { def process(cmd: String): Unit = { diff --git a/scouter.server/src/main/scala/scouter/server/term/handler/TAGCNT.scala b/scouter.server/src/main/scala/scouter/server/term/handler/TAGCNT.scala index 8116fe112..f88988f2b 100644 --- a/scouter.server/src/main/scala/scouter/server/term/handler/TAGCNT.scala +++ b/scouter.server/src/main/scala/scouter/server/term/handler/TAGCNT.scala @@ -28,7 +28,7 @@ import scouter.server.util.ThreadScala import scouter.util.DateUtil import scouter.util.FormatUtil import scouter.util.StringUtil -import scala.collection.JavaConversions._ +import scala.jdk.CollectionConverters._ import scouter.util.IntSet import scouter.server.core.cache.XLogCache import scouter.io.DataInputX diff --git a/scouter.server/src/main/scala/scouter/server/term/handler/VISITOR.scala b/scouter.server/src/main/scala/scouter/server/term/handler/VISITOR.scala index 91aed5a0f..47c0e936e 100644 --- a/scouter.server/src/main/scala/scouter/server/term/handler/VISITOR.scala +++ b/scouter.server/src/main/scala/scouter/server/term/handler/VISITOR.scala @@ -28,7 +28,7 @@ import scouter.server.util.ThreadScala import scouter.util.DateUtil import scouter.util.FormatUtil import scouter.util.StringUtil -import scala.collection.JavaConversions._ +import scala.jdk.CollectionConverters._ import scouter.util.IntSet import scouter.server.core.cache.XLogCache import scouter.io.DataInputX diff --git a/scouter.server/src/main/scala/scouter/server/term/handler/XLIST.scala b/scouter.server/src/main/scala/scouter/server/term/handler/XLIST.scala index 510ec6e67..759d99c69 100644 --- a/scouter.server/src/main/scala/scouter/server/term/handler/XLIST.scala +++ b/scouter.server/src/main/scala/scouter/server/term/handler/XLIST.scala @@ -28,7 +28,7 @@ import scouter.server.util.ThreadScala import scouter.util.DateUtil import scouter.util.FormatUtil import scouter.util.StringUtil -import scala.collection.JavaConversions._ +import scala.jdk.CollectionConverters._ import scouter.util.IntSet import scouter.server.core.cache.XLogCache import scouter.io.DataInputX diff --git a/scouter.server/src/main/scala/scouter/server/term/handler/XLOG.scala b/scouter.server/src/main/scala/scouter/server/term/handler/XLOG.scala index c4ede9930..4b094fc02 100644 --- a/scouter.server/src/main/scala/scouter/server/term/handler/XLOG.scala +++ b/scouter.server/src/main/scala/scouter/server/term/handler/XLOG.scala @@ -28,7 +28,7 @@ import scouter.server.util.ThreadScala import scouter.util.DateUtil import scouter.util.FormatUtil import scouter.util.StringUtil -import scala.collection.JavaConversions._ +import scala.jdk.CollectionConverters._ import scouter.util.IntSet import scouter.server.core.cache.XLogCache import scouter.io.DataInputX diff --git a/scouter.weaver/pom.xml b/scouter.weaver/pom.xml index df2196f27..7d614b55b 100644 --- a/scouter.weaver/pom.xml +++ b/scouter.weaver/pom.xml @@ -1,31 +1,24 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + io.github.scouter-project scouter-parent - 2.21.3 + 2.21.4 - 4.0.0 - io.github.scouter-project scouter-weaver jar scouter.weaver - yyyy-MM-dd HH:mm - ${maven.build.timestamp} GMT ${project.build.directory}/assembly-working - UTF-8 scouter.weaver - - - - @@ -33,21 +26,5 @@ true - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - + \ No newline at end of file diff --git a/scouter.webapp/pom.xml b/scouter.webapp/pom.xml index d3f3e7f5a..9e66d63c0 100644 --- a/scouter.webapp/pom.xml +++ b/scouter.webapp/pom.xml @@ -1,177 +1,127 @@ - + + 4.0.0 + io.github.scouter-project scouter-parent - 2.21.3 + 2.21.4 - 4.0.0 - io.github.scouter-project scouter-webapp jar scouter.webapp - yyyy-MM-dd HH:mm - ${maven.build.timestamp} GMT ${project.build.directory}/assembly-working - UTF-8 scouter.webapp - 1.6.14 io.github.scouter-project scouter-common - ${project.version} io.github.scouter-project scouter-server - ${project.version} provided org.eclipse.jetty jetty-server - ${jetty.version} org.eclipse.jetty jetty-servlet - ${jetty.version} - - - - - - - - - - - - org.eclipse.jetty.websocket javax-websocket-server-impl - ${jetty.version} org.glassfish.jersey.containers jersey-container-servlet-core - ${jersey.version} org.glassfish.jersey.inject jersey-hk2 - ${jersey.version} com.fasterxml.jackson.core jackson-core - 2.12.6 com.fasterxml.jackson.core jackson-databind - 2.12.6.1 org.glassfish.jersey.media jersey-media-json-jackson - ${jersey.version} org.glassfish.jersey.ext jersey-bean-validation - ${jersey.version} javax.xml.bind jaxb-api - 2.3.0 - - - com.sun.xml.bind - jaxb-core - 2.3.0 - - - com.sun.xml.bind - jaxb-impl - 2.3.0 javax.activation activation - 1.1.1 org.projectlombok lombok - 1.16.18 provided org.slf4j slf4j-api - ${slf4j.version} ch.qos.logback logback-classic - ${logback.version} org.apache.commons commons-lang3 - 3.6 commons-collections commons-collections - 3.2.2 - - io.swagger swagger-jersey2-jaxrs - ${swagger.version} junit junit - 4.13.1 test org.assertj assertj-core - 3.8.0 test org.mockito mockito-all - 1.10.19 test org.powermock powermock-module-junit4 - 1.7.3 test org.powermock powermock-api-mockito - 1.7.3 test @@ -193,21 +143,8 @@ + - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - org.apache.maven.plugins maven-dependency-plugin @@ -228,81 +165,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + org.apache.maven.plugins maven-antrun-plugin - 1.8 make-assembly package + + run + - + - + - + - - + + - + - + - - - + + + - - + + - - - + + - - run - - + \ No newline at end of file diff --git a/scouter.webapp/src/main/java/scouterx/webapp/model/scouter/SUser.java b/scouter.webapp/src/main/java/scouterx/webapp/model/scouter/SUser.java index 6c0b69025..109e9aac6 100644 --- a/scouter.webapp/src/main/java/scouterx/webapp/model/scouter/SUser.java +++ b/scouter.webapp/src/main/java/scouterx/webapp/model/scouter/SUser.java @@ -25,6 +25,8 @@ import javax.validation.constraints.NotNull; +import com.fasterxml.jackson.annotation.JsonCreator; + /** * @author Gun Lee (gunlee01@gmail.com) on 2017. 8. 27. */ @@ -37,6 +39,11 @@ public class SUser { String id; String password; + @JsonCreator + public SUser() { + + } + public SUser(String id) { this.id = id; }