Merge branch 'apache:master' into master

sadadw1 · Sep 13, 2024 · b43d435 · b43d435
2 parents 0a155e8 + 172610b
commit b43d435
Show file tree

Hide file tree

Showing 860 changed files with 497 additions and 54,289 deletions.
diff --git a/ozhera-app/app-api/pom.xml b/ozhera-app/app-api/pom.xml
@@ -11,12 +11,12 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>app-api</artifactId>
-    <version>${hera-app.release.version}</version>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.ozhera</groupId>
             <artifactId>app-common</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

diff --git a/ozhera-intelligence/ozhera-intelligence-service/pom.xml b/ozhera-intelligence/ozhera-intelligence-service/pom.xml
@@ -56,8 +56,9 @@
 
         <!-- trace domain -->
         <dependency>
-            <groupId>org.apache.ozhera</groupId>
+            <groupId>run.mone</groupId>
             <artifactId>trace-etl-domain</artifactId>
+            <version>1.0.1-jdk21</version>
         </dependency>
 
         <dependency>

diff --git a/ozhera-intelligence/pom.xml b/ozhera-intelligence/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.ozhera</groupId>
-        <artifactId>ozhera</artifactId>
+        <artifactId>ozhera-parent</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 

diff --git a/ozhera-log/log-agent-server/pom.xml b/ozhera-log/log-agent-server/pom.xml
@@ -3,9 +3,9 @@
          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">
     <parent>
+        <groupId>org.apache.ozhera</groupId>
         <artifactId>ozhera-log</artifactId>
-        <groupId>run.mone</groupId>
-        <version>1.4.0-jdk21</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -153,7 +153,7 @@
                     <archive>
                         <addMavenDescriptor>false</addMavenDescriptor>
                         <manifest>
-                            <mainClass>com.xiaomi.mone.log.server.LogAgentServerBootstrap</mainClass>
+                            <mainClass>org.apache.ozhera.log.server.LogAgentServerBootstrap</mainClass>
                         </manifest>
                     </archive>
                 </configuration>

diff --git a/...og/log-agent-server/src/main/java/com/xiaomi/mone/log/server/LogAgentServerBootstrap.java b/...og/log-agent-server/src/main/java/com/xiaomi/mone/log/server/LogAgentServerBootstrap.java
diff --git a/...-log/log-agent-server/src/main/java/com/xiaomi/mone/log/server/common/ServerConstant.java b/...-log/log-agent-server/src/main/java/com/xiaomi/mone/log/server/common/ServerConstant.java
diff --git a/ozhera-log/log-agent-server/src/main/java/com/xiaomi/mone/log/server/common/Version.java b/ozhera-log/log-agent-server/src/main/java/com/xiaomi/mone/log/server/common/Version.java
diff --git a/...ver/src/main/java/com/xiaomi/mone/log/server/porcessor/AgentCollectProgressProcessor.java b/...ver/src/main/java/com/xiaomi/mone/log/server/porcessor/AgentCollectProgressProcessor.java
diff --git a/...agent-server/src/main/java/com/xiaomi/mone/log/server/porcessor/AgentConfigProcessor.java b/...agent-server/src/main/java/com/xiaomi/mone/log/server/porcessor/AgentConfigProcessor.java
diff --git a/...og/log-agent-server/src/main/java/com/xiaomi/mone/log/server/porcessor/PingProcessor.java b/...og/log-agent-server/src/main/java/com/xiaomi/mone/log/server/porcessor/PingProcessor.java