Merge pull request #942 from scouter-project/develop

Develop
scouter-project · May 29, 2023 · 1b54b18 · 1b54b18
2 parents 2f8c29c + 8bde73c
commit 1b54b18
Show file tree

Hide file tree

Showing 137 changed files with 3,933 additions and 5,417 deletions.
diff --git a/build_package.sh b/build_package.sh
@@ -15,6 +15,6 @@ if [ -z "$MVN" ]; then
 	exit 1
 else
     $MVN -Dmaven.test.skip=true clean install
-    $MVN -Dmaven.test.skip=true -f ./scouter.agent.java/pom.xml -Pjava-legacy clean package
+#    $MVN -Dmaven.test.skip=true -f ./scouter.agent.java/pom.xml -Pjava-legacy clean package
     $MVN -Dmaven.test.skip=true -f ./scouter.deploy/pom.xml clean package
 fi
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>io.github.scouter-project</groupId>
     <artifactId>scouter-parent</artifactId>
-    <version>2.17.1</version> <!--scouter-->
+    <version>2.20.0</version> <!--scouter-->
     <packaging>pom</packaging>
 
     <name>SCOUTER APM</name>
@@ -22,6 +22,7 @@
         <module>scouter.agent.host</module>
         <module>scouter.agent.java</module>
         <module>scouter.agent.batch</module>
+        <module>scouter.extra.java20</module>
     </modules>
 
     <properties>
@@ -176,7 +177,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.5.0</version>
             </plugin>
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>

diff --git a/scouter.agent.batch/pom.xml b/scouter.agent.batch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.github.scouter-project</groupId>
         <artifactId>scouter-parent</artifactId>
-        <version>2.17.1</version> <!--scouter-->
+        <version>2.20.0</version> <!--scouter-->
     </parent>
 
     <artifactId>scouter-agent-batch</artifactId>

diff --git a/scouter.agent.host/pom.xml b/scouter.agent.host/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.github.scouter-project</groupId>
         <artifactId>scouter-parent</artifactId>
-        <version>2.17.1</version> <!--scouter-->
+        <version>2.20.0</version> <!--scouter-->
     </parent>
 
     <artifactId>scouter-agent-host</artifactId>
@@ -25,16 +25,11 @@
             <artifactId>scouter-common</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-        <!-- provided -->
         <dependency>
-            <groupId>scouter.dependency</groupId>
-            <artifactId>sigar</artifactId>
-            <version>0.0.0</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/sigar.jar</systemPath>
+            <groupId>com.github.oshi</groupId>
+            <artifactId>oshi-core</artifactId>
+            <version>6.3.1</version>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -50,9 +45,9 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <compilerVersion>1.6</compilerVersion>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <compilerVersion>1.8</compilerVersion>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/scouter.agent.host/src/main/java/org/hyperic/sigar/cmd/CpuInfo.java b/scouter.agent.host/src/main/java/org/hyperic/sigar/cmd/CpuInfo.java
diff --git a/scouter.agent.host/src/main/java/org/hyperic/sigar/cmd/Df.java b/scouter.agent.host/src/main/java/org/hyperic/sigar/cmd/Df.java