Skip to content

Commit

Permalink
refactor: compile with new groupId (#472)
Browse files Browse the repository at this point in the history
  • Loading branch information
@shanwb
shanwb committed Sep 14, 2024
1 parent a5d4d5c commit d2b96fd
Show file tree
Hide file tree
Showing 22 changed files with 142 additions and 79 deletions.
6 changes: 3 additions & 3 deletions ozhera-demo-client/ozhera-demo-client-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ozhera-demo-client/ozhera-demo-client-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
9 changes: 4 additions & 5 deletions ozhera-demo-client/ozhera-demo-client-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down Expand Up @@ -106,7 +105,7 @@
</dependency>

<dependency>
<groupId>run.mone</groupId>
<groupId>org.apache.ozhera</groupId>
<artifactId>prometheus-diy-starter</artifactId>
<exclusions>
<exclusion>
Expand Down
11 changes: 4 additions & 7 deletions ozhera-demo-client/ozhera-demo-client-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down
33 changes: 24 additions & 9 deletions ozhera-demo-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>


Expand All @@ -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>
Expand Down
6 changes: 2 additions & 4 deletions ozhera-demo-server/ozhera-demo-server-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions ozhera-demo-server/ozhera-demo-server-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -22,7 +22,7 @@

<dependencies>
<dependency>
<groupId>run.mone</groupId>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-demo-server-api</artifactId>
</dependency>

Expand Down
13 changes: 6 additions & 7 deletions ozhera-demo-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>


Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ozhera-monitor/ozhera-monitor-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions ozhera-monitor/ozhera-monitor-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
8 changes: 4 additions & 4 deletions ozhera-monitor/ozhera-monitor-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down
16 changes: 8 additions & 8 deletions ozhera-monitor/ozhera-monitor-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -24,12 +24,12 @@
</dependency>

<dependency>
<groupId>run.mone</groupId>
<groupId>org.apache.ozhera</groupId>
<artifactId>app-api</artifactId>
</dependency>

<dependency>
<groupId>run.mone</groupId>
<groupId>org.apache.ozhera</groupId>
<artifactId>app-common</artifactId>
</dependency>

Expand All @@ -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>

Expand Down Expand Up @@ -221,7 +221,7 @@
</dependency>

<dependency>
<groupId>run.mone</groupId>
<groupId>org.apache.ozhera</groupId>
<artifactId>log-api</artifactId>
</dependency>

Expand All @@ -236,7 +236,7 @@
</dependency>

<dependency>
<groupId>run.mone</groupId>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-prometheus-agent-api</artifactId>
</dependency>

Expand Down
49 changes: 44 additions & 5 deletions ozhera-monitor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -31,6 +30,46 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>app-api</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>app-common</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>log-api</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-prometheus-agent-api</artifactId>
<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>

Expand Down
Loading

0 comments on commit d2b96fd

Please sign in to comment.