refactor: compile with new groupId (#472) (#480)

apache · Sep 14, 2024 · 45ca0e2 · 45ca0e2
1 parent 8dddb0b
commit 45ca0e2
Show file tree

Hide file tree

Showing 19 changed files with 103 additions and 72 deletions.
diff --git a/ozhera-demo-client/ozhera-demo-client-api/pom.xml b/ozhera-demo-client/ozhera-demo-client-api/pom.xml
@@ -4,14 +4,14 @@
          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-demo-client</artifactId>
-        <groupId>run.mone</groupId>
-        <version>1.0.0-jdk21</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>ozhera-demo-client-api</artifactId>
-    <version>1.0.0-jdk21</version>
+    <version>2.0.0-SNAPSHOT</version>
 
 
     <dependencies>

diff --git a/ozhera-demo-client/ozhera-demo-client-common/pom.xml b/ozhera-demo-client/ozhera-demo-client-common/pom.xml
@@ -4,9 +4,9 @@
          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-demo-client</artifactId>
-        <groupId>run.mone</groupId>
-        <version>1.0.0-jdk21</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ozhera-demo-client/ozhera-demo-client-server/pom.xml b/ozhera-demo-client/ozhera-demo-client-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-demo-client</artifactId>
-        <groupId>run.mone</groupId>
-        <version>1.0.0-jdk21</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -23,9 +23,8 @@
     <dependencies>
 
         <dependency>
-            <groupId>run.mone</groupId>
+            <groupId>org.apache.ozhera</groupId>
             <artifactId>ozhera-demo-client-service</artifactId>
-            <version>${project.parent.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>spring-boot-starter-logging</artifactId>
@@ -106,7 +105,7 @@
         </dependency>
 
         <dependency>
-            <groupId>run.mone</groupId>
+            <groupId>org.apache.ozhera</groupId>
             <artifactId>prometheus-diy-starter</artifactId>
             <exclusions>
                 <exclusion>

diff --git a/ozhera-demo-client/ozhera-demo-client-service/pom.xml b/ozhera-demo-client/ozhera-demo-client-service/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-demo-client</artifactId>
-        <groupId>run.mone</groupId>
-        <version>1.0.0-jdk21</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -51,15 +51,12 @@
         </dependency>
 
         <dependency>
-            <groupId>run.mone</groupId>
+            <groupId>org.apache.ozhera</groupId>
             <artifactId>ozhera-demo-client-api</artifactId>
-            <version>${project.parent.version}</version>
         </dependency>
-
         <dependency>
-            <groupId>run.mone</groupId>
+            <groupId>org.apache.ozhera</groupId>
             <artifactId>ozhera-demo-client-common</artifactId>
-            <version>${project.parent.version}</version>
         </dependency>
 
         <dependency>

diff --git a/ozhera-demo-client/pom.xml b/ozhera-demo-client/pom.xml
@@ -4,15 +4,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>run.mone</groupId>
-        <artifactId>ozhera</artifactId>
-        <version>1.4.0-jdk21-SNAPSHOT</version>
+        <groupId>org.apache.ozhera</groupId>
+        <artifactId>ozhera-parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>run.mone</groupId>
     <artifactId>ozhera-demo-client</artifactId>
-    <version>1.0.0-jdk21</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
 
@@ -35,19 +34,35 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>run.mone</groupId>
+                <groupId>org.apache.ozhera</groupId>
                 <artifactId>ozhera-demo-server-api</artifactId>
-                <version>1.0.2-jdk21</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.ozhera</groupId>
+                <artifactId>ozhera-demo-client-api</artifactId>
+                <version>2.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ozhera</groupId>
+                <artifactId>ozhera-demo-client-service</artifactId>
+                <version>2.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ozhera</groupId>
+                <artifactId>ozhera-demo-client-common</artifactId>
+                <version>2.0.0-SNAPSHOT</version>
+            </dependency>
+
             <dependency>
                 <groupId>net.devh</groupId>
                 <artifactId>grpc-spring-boot-starter</artifactId>
                 <version>2.15.0.RELEASE</version>
             </dependency>
             <dependency>
-                <groupId>run.mone</groupId>
+                <groupId>org.apache.ozhera</groupId>
                 <artifactId>prometheus-diy-starter</artifactId>
-                <version>0.0.1-opensource-jdk21</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>

diff --git a/ozhera-demo-server/ozhera-demo-server-api/pom.xml b/ozhera-demo-server/ozhera-demo-server-api/pom.xml
@@ -4,15 +4,13 @@
          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-demo-server</artifactId>
-        <groupId>run.mone</groupId>
-        <version>1.0.2-jdk21</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>ozhera-demo-server-api</artifactId>
-    <version>1.0.2-jdk21</version>
-
 
     <dependencies>
         <dependency>

diff --git a/ozhera-demo-server/ozhera-demo-server-server/pom.xml b/ozhera-demo-server/ozhera-demo-server-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-demo-server</artifactId>
-        <groupId>run.mone</groupId>
-        <version>1.0.2-jdk21</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>run.mone</groupId>
+            <groupId>org.apache.ozhera</groupId>
             <artifactId>ozhera-demo-server-api</artifactId>
         </dependency>
 

diff --git a/ozhera-demo-server/pom.xml b/ozhera-demo-server/pom.xml
@@ -4,15 +4,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>run.mone</groupId>
-        <artifactId>ozhera</artifactId>
-        <version>1.4.0-jdk21-SNAPSHOT</version>
+        <groupId>org.apache.ozhera</groupId>
+        <artifactId>ozhera-parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ozhera-demo-server</artifactId>
-    <groupId>run.mone</groupId>
-    <version>1.0.2-jdk21</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
 
@@ -39,9 +38,9 @@
                 <version>2.15.0.RELEASE</version>
             </dependency>
             <dependency>
-                <groupId>run.mone</groupId>
+                <groupId>org.apache.ozhera</groupId>
                 <artifactId>ozhera-demo-server-api</artifactId>
-                <version>1.0.2-jdk21</version>
+                <version>2.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>

diff --git a/ozhera-monitor/ozhera-monitor-api/pom.xml b/ozhera-monitor/ozhera-monitor-api/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>run.mone</groupId>
+        <groupId>org.apache.ozhera</groupId>
         <artifactId>ozhera-monitor</artifactId>
-        <version>1.3-jdk21</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ozhera-monitor/ozhera-monitor-common/pom.xml b/ozhera-monitor/ozhera-monitor-common/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>run.mone</groupId>
+        <groupId>org.apache.ozhera</groupId>
         <artifactId>ozhera-monitor</artifactId>
-        <version>1.3-jdk21</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ozhera-monitor/ozhera-monitor-server/pom.xml b/ozhera-monitor/ozhera-monitor-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>run.mone</groupId>
+        <groupId>org.apache.ozhera</groupId>
         <artifactId>ozhera-monitor</artifactId>
-        <version>1.3-jdk21</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,8 +24,8 @@
         </dependency>
 
         <dependency>
-            <groupId>run.mone</groupId>
-            <artifactId>ozhera-monitor-common</artifactId>
+            <groupId>org.apache.ozhera</groupId>
+            <artifactId>ozhera-monitor-service</artifactId>
         </dependency>
 
         <dependency>

diff --git a/ozhera-monitor/ozhera-monitor-service/pom.xml b/ozhera-monitor/ozhera-monitor-service/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>run.mone</groupId>
+        <groupId>org.apache.ozhera</groupId>
         <artifactId>ozhera-monitor</artifactId>
-        <version>1.3-jdk21</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -56,11 +56,11 @@
 
         <!--modules dependency-->
         <dependency>
-            <groupId>run.mone</groupId>
+            <groupId>org.apache.ozhera</groupId>
             <artifactId>ozhera-monitor-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>run.mone</groupId>
+            <groupId>org.apache.ozhera</groupId>
             <artifactId>ozhera-monitor-api</artifactId>
         </dependency>
 

diff --git a/ozhera-monitor/pom.xml b/ozhera-monitor/pom.xml
@@ -5,15 +5,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>run.mone</groupId>
-        <artifactId>ozhera</artifactId>
-        <version>1.4.0-jdk21-SNAPSHOT</version>
+        <groupId>org.apache.ozhera</groupId>
+        <artifactId>ozhera-parent</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>run.mone</groupId>
     <artifactId>ozhera-monitor</artifactId>
     <packaging>pom</packaging>
-    <version>1.3-jdk21</version>
+    <version>2.0.0-SNAPSHOT</version>
     <modules>
         <module>ozhera-monitor-server</module>
         <module>ozhera-monitor-service</module>
@@ -55,6 +54,22 @@
                 <version>2.0.0-SNAPSHOT</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.ozhera</groupId>
+                <artifactId>ozhera-monitor-api</artifactId>
+                <version>2.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ozhera</groupId>
+                <artifactId>ozhera-monitor-common</artifactId>
+                <version>2.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ozhera</groupId>
+                <artifactId>ozhera-monitor-service</artifactId>
+                <version>2.0.0-SNAPSHOT</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

diff --git a/ozhera-operator/ozhera-operator-server/pom.xml b/ozhera-operator/ozhera-operator-server/pom.xml
@@ -25,7 +25,6 @@
         <dependency>
             <groupId>org.apache.ozhera</groupId>
             <artifactId>ozhera-operator-service</artifactId>
-            <version>${project.parent.version}</version>
         </dependency>
 
         <!-- test -->

diff --git a/ozhera-operator/ozhera-operator-service/pom.xml b/ozhera-operator/ozhera-operator-service/pom.xml
@@ -16,7 +16,6 @@
         <dependency>
             <groupId>org.apache.ozhera</groupId>
             <artifactId>ozhera-operator-common</artifactId>
-            <version>${project.parent.version}</version>
         </dependency>
 
         <dependency>

diff --git a/ozhera-operator/pom.xml b/ozhera-operator/pom.xml
@@ -10,7 +10,6 @@
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.ozhera</groupId>
     <artifactId>ozhera-operator</artifactId>
     <packaging>pom</packaging>
     <version>2.0.0-SNAPSHOT</version>
@@ -22,6 +21,18 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.apache.ozhera</groupId>
+                <artifactId>ozhera-operator-service</artifactId>
+                <version>2.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ozhera</groupId>
+                <artifactId>ozhera-operator-common</artifactId>
+                <version>2.0.0-SNAPSHOT</version>
+            </dependency>
+
+
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-text</artifactId>