From d2b96fd37d33089bcd3af78a2858abc2bf922886 Mon Sep 17 00:00:00 2001 From: shanwb Date: Sat, 14 Sep 2024 18:30:01 +0800 Subject: [PATCH] refactor: compile with new groupId (#472) --- .../ozhera-demo-client-api/pom.xml | 6 +-- .../ozhera-demo-client-common/pom.xml | 4 +- .../ozhera-demo-client-server/pom.xml | 9 ++-- .../ozhera-demo-client-service/pom.xml | 11 ++--- ozhera-demo-client/pom.xml | 33 +++++++++---- .../ozhera-demo-server-api/pom.xml | 6 +-- .../ozhera-demo-server-server/pom.xml | 6 +-- ozhera-demo-server/pom.xml | 13 +++-- ozhera-monitor/ozhera-monitor-api/pom.xml | 4 +- ozhera-monitor/ozhera-monitor-common/pom.xml | 4 +- ozhera-monitor/ozhera-monitor-server/pom.xml | 8 +-- ozhera-monitor/ozhera-monitor-service/pom.xml | 16 +++--- ozhera-monitor/pom.xml | 49 +++++++++++++++++-- .../ozhera-operator-server/pom.xml | 1 - .../ozhera-operator-service/pom.xml | 1 - ozhera-operator/pom.xml | 13 ++++- ozhera-webhook/ozhera-webhook-server/pom.xml | 4 +- prometheus-starter-all/pom.xml | 11 ++--- .../prometheus-diy-client/pom.xml | 4 +- .../prometheus-diy-starter/pom.xml | 8 +-- trace-etl/pom.xml | 8 +++ trace-etl/trace-etl-api/pom.xml | 2 +- 22 files changed, 142 insertions(+), 79 deletions(-) diff --git a/ozhera-demo-client/ozhera-demo-client-api/pom.xml b/ozhera-demo-client/ozhera-demo-client-api/pom.xml index 516e78d95..571b2066f 100644 --- 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"> + org.apache.ozhera ozhera-demo-client - run.mone - 1.0.0-jdk21 + 2.0.0-SNAPSHOT 4.0.0 ozhera-demo-client-api - 1.0.0-jdk21 + 2.0.0-SNAPSHOT diff --git a/ozhera-demo-client/ozhera-demo-client-common/pom.xml b/ozhera-demo-client/ozhera-demo-client-common/pom.xml index 9a96f4eb7..27dc940f0 100644 --- 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"> + org.apache.ozhera ozhera-demo-client - run.mone - 1.0.0-jdk21 + 2.0.0-SNAPSHOT 4.0.0 diff --git a/ozhera-demo-client/ozhera-demo-client-server/pom.xml b/ozhera-demo-client/ozhera-demo-client-server/pom.xml index bcff8cc35..f0c5777a4 100644 --- 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"> + org.apache.ozhera ozhera-demo-client - run.mone - 1.0.0-jdk21 + 2.0.0-SNAPSHOT 4.0.0 @@ -23,9 +23,8 @@ - run.mone + org.apache.ozhera ozhera-demo-client-service - ${project.parent.version} spring-boot-starter-logging @@ -106,7 +105,7 @@ - run.mone + org.apache.ozhera prometheus-diy-starter diff --git a/ozhera-demo-client/ozhera-demo-client-service/pom.xml b/ozhera-demo-client/ozhera-demo-client-service/pom.xml index 66bed064e..f47036fa9 100644 --- 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"> + org.apache.ozhera ozhera-demo-client - run.mone - 1.0.0-jdk21 + 2.0.0-SNAPSHOT 4.0.0 @@ -51,15 +51,12 @@ - run.mone + org.apache.ozhera ozhera-demo-client-api - ${project.parent.version} - - run.mone + org.apache.ozhera ozhera-demo-client-common - ${project.parent.version} diff --git a/ozhera-demo-client/pom.xml b/ozhera-demo-client/pom.xml index 02939c76d..a59a9dfaa 100644 --- 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"> - run.mone - ozhera - 1.4.0-jdk21-SNAPSHOT + org.apache.ozhera + ozhera-parent + 2.0.0-SNAPSHOT 4.0.0 - run.mone ozhera-demo-client - 1.0.0-jdk21 + 2.0.0-SNAPSHOT pom @@ -35,19 +34,35 @@ - run.mone + org.apache.ozhera ozhera-demo-server-api - 1.0.2-jdk21 + 2.0.0-SNAPSHOT + + org.apache.ozhera + ozhera-demo-client-api + 2.0.0-SNAPSHOT + + + org.apache.ozhera + ozhera-demo-client-service + 2.0.0-SNAPSHOT + + + org.apache.ozhera + ozhera-demo-client-common + 2.0.0-SNAPSHOT + + net.devh grpc-spring-boot-starter 2.15.0.RELEASE - run.mone + org.apache.ozhera prometheus-diy-starter - 0.0.1-opensource-jdk21 + 2.0.0-SNAPSHOT org.apache.logging.log4j diff --git a/ozhera-demo-server/ozhera-demo-server-api/pom.xml b/ozhera-demo-server/ozhera-demo-server-api/pom.xml index 20975c346..98433d733 100644 --- 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"> + org.apache.ozhera ozhera-demo-server - run.mone - 1.0.2-jdk21 + 2.0.0-SNAPSHOT 4.0.0 ozhera-demo-server-api - 1.0.2-jdk21 - diff --git a/ozhera-demo-server/ozhera-demo-server-server/pom.xml b/ozhera-demo-server/ozhera-demo-server-server/pom.xml index bf6429454..77cf13f86 100644 --- 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"> + org.apache.ozhera ozhera-demo-server - run.mone - 1.0.2-jdk21 + 2.0.0-SNAPSHOT 4.0.0 @@ -22,7 +22,7 @@ - run.mone + org.apache.ozhera ozhera-demo-server-api diff --git a/ozhera-demo-server/pom.xml b/ozhera-demo-server/pom.xml index b94c128b1..ed1e5d038 100644 --- 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"> - run.mone - ozhera - 1.4.0-jdk21-SNAPSHOT + org.apache.ozhera + ozhera-parent + 2.0.0-SNAPSHOT 4.0.0 ozhera-demo-server - run.mone - 1.0.2-jdk21 + 2.0.0-SNAPSHOT pom @@ -39,9 +38,9 @@ 2.15.0.RELEASE - run.mone + org.apache.ozhera ozhera-demo-server-api - 1.0.2-jdk21 + 2.0.0-SNAPSHOT org.springframework.boot diff --git a/ozhera-monitor/ozhera-monitor-api/pom.xml b/ozhera-monitor/ozhera-monitor-api/pom.xml index 3474a0fbd..393a2e67b 100644 --- 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"> - run.mone + org.apache.ozhera ozhera-monitor - 1.3-jdk21 + 2.0.0-SNAPSHOT 4.0.0 diff --git a/ozhera-monitor/ozhera-monitor-common/pom.xml b/ozhera-monitor/ozhera-monitor-common/pom.xml index 7f4296152..8e1906da5 100644 --- 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"> - run.mone + org.apache.ozhera ozhera-monitor - 1.3-jdk21 + 2.0.0-SNAPSHOT 4.0.0 diff --git a/ozhera-monitor/ozhera-monitor-server/pom.xml b/ozhera-monitor/ozhera-monitor-server/pom.xml index ee431143f..662a5c6ff 100644 --- 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"> - run.mone + org.apache.ozhera ozhera-monitor - 1.3-jdk21 + 2.0.0-SNAPSHOT 4.0.0 @@ -24,8 +24,8 @@ - run.mone - ozhera-monitor-common + org.apache.ozhera + ozhera-monitor-service diff --git a/ozhera-monitor/ozhera-monitor-service/pom.xml b/ozhera-monitor/ozhera-monitor-service/pom.xml index 49b6d1eb9..38341fea4 100644 --- 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"> - run.mone + org.apache.ozhera ozhera-monitor - 1.3-jdk21 + 2.0.0-SNAPSHOT 4.0.0 @@ -24,12 +24,12 @@ - run.mone + org.apache.ozhera app-api - run.mone + org.apache.ozhera app-common @@ -56,11 +56,11 @@ - run.mone + org.apache.ozhera ozhera-monitor-common - run.mone + org.apache.ozhera ozhera-monitor-api @@ -221,7 +221,7 @@ - run.mone + org.apache.ozhera log-api @@ -236,7 +236,7 @@ - run.mone + org.apache.ozhera ozhera-prometheus-agent-api diff --git a/ozhera-monitor/pom.xml b/ozhera-monitor/pom.xml index b6fd49396..2cb311761 100644 --- a/ozhera-monitor/pom.xml +++ b/ozhera-monitor/pom.xml @@ -5,15 +5,14 @@ 4.0.0 - run.mone - ozhera - 1.4.0-jdk21-SNAPSHOT + org.apache.ozhera + ozhera-parent + 2.0.0-SNAPSHOT - run.mone ozhera-monitor pom - 1.3-jdk21 + 2.0.0-SNAPSHOT ozhera-monitor-server ozhera-monitor-service @@ -31,6 +30,46 @@ + + org.apache.ozhera + app-api + 2.0.0-SNAPSHOT + + + + org.apache.ozhera + app-common + 2.0.0-SNAPSHOT + + + + org.apache.ozhera + log-api + 2.0.0-SNAPSHOT + + + + org.apache.ozhera + ozhera-prometheus-agent-api + 2.0.0-SNAPSHOT + + + + org.apache.ozhera + ozhera-monitor-api + 2.0.0-SNAPSHOT + + + org.apache.ozhera + ozhera-monitor-common + 2.0.0-SNAPSHOT + + + org.apache.ozhera + ozhera-monitor-service + 2.0.0-SNAPSHOT + + diff --git a/ozhera-operator/ozhera-operator-server/pom.xml b/ozhera-operator/ozhera-operator-server/pom.xml index 888d9ad92..357af0b98 100644 --- a/ozhera-operator/ozhera-operator-server/pom.xml +++ b/ozhera-operator/ozhera-operator-server/pom.xml @@ -25,7 +25,6 @@ org.apache.ozhera ozhera-operator-service - ${project.parent.version} diff --git a/ozhera-operator/ozhera-operator-service/pom.xml b/ozhera-operator/ozhera-operator-service/pom.xml index 6e33c24fd..8a2596530 100644 --- a/ozhera-operator/ozhera-operator-service/pom.xml +++ b/ozhera-operator/ozhera-operator-service/pom.xml @@ -16,7 +16,6 @@ org.apache.ozhera ozhera-operator-common - ${project.parent.version} diff --git a/ozhera-operator/pom.xml b/ozhera-operator/pom.xml index 1c724a322..34c540c59 100644 --- a/ozhera-operator/pom.xml +++ b/ozhera-operator/pom.xml @@ -10,7 +10,6 @@ 2.0.0-SNAPSHOT - org.apache.ozhera ozhera-operator pom 2.0.0-SNAPSHOT @@ -22,6 +21,18 @@ + + org.apache.ozhera + ozhera-operator-service + 2.0.0-SNAPSHOT + + + org.apache.ozhera + ozhera-operator-common + 2.0.0-SNAPSHOT + + + org.apache.commons commons-text diff --git a/ozhera-webhook/ozhera-webhook-server/pom.xml b/ozhera-webhook/ozhera-webhook-server/pom.xml index 1fe3222c1..58e6dff66 100644 --- a/ozhera-webhook/ozhera-webhook-server/pom.xml +++ b/ozhera-webhook/ozhera-webhook-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"> - run.mone + org.apache.ozhera ozhera-webhook - 1.0-jdk21 + 2.0.0-SNAPSHOT 4.0.0 diff --git a/prometheus-starter-all/pom.xml b/prometheus-starter-all/pom.xml index fb5e40444..741e53543 100644 --- a/prometheus-starter-all/pom.xml +++ b/prometheus-starter-all/pom.xml @@ -4,16 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - run.mone - ozhera - 1.4.0-jdk21-SNAPSHOT + org.apache.ozhera + ozhera-parent + 2.0.0-SNAPSHOT 4.0.0 - run.mone prometheus-starter-all - 1.0-opensource-jdk21 + 2.0.0-SNAPSHOT pom @@ -22,7 +21,7 @@ - 0.0.1-opensource-jdk21 + 2.0.0-SNAPSHOT diff --git a/prometheus-starter-all/prometheus-diy-client/pom.xml b/prometheus-starter-all/prometheus-diy-client/pom.xml index 0cc23acee..5c19cc1f2 100644 --- a/prometheus-starter-all/prometheus-diy-client/pom.xml +++ b/prometheus-starter-all/prometheus-diy-client/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"> + org.apache.ozhera prometheus-starter-all - run.mone - 1.0-opensource-jdk21 + 2.0.0-SNAPSHOT 4.0.0 diff --git a/prometheus-starter-all/prometheus-diy-starter/pom.xml b/prometheus-starter-all/prometheus-diy-starter/pom.xml index 1266c37c5..afa2d5f8d 100644 --- a/prometheus-starter-all/prometheus-diy-starter/pom.xml +++ b/prometheus-starter-all/prometheus-diy-starter/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"> + org.apache.ozhera prometheus-starter-all - run.mone - 1.0-opensource-jdk21 + 2.0.0-SNAPSHOT 4.0.0 @@ -15,9 +15,9 @@ - run.mone + org.apache.ozhera prometheus-diy-client - ${prometheus-all.version} + 0.0.1-opensource-jdk21 diff --git a/trace-etl/pom.xml b/trace-etl/pom.xml index c04e2018e..0b2a1ec8d 100644 --- a/trace-etl/pom.xml +++ b/trace-etl/pom.xml @@ -73,6 +73,14 @@ prometheus-trace-etl 0.0.6-jdk21 + + + org.apache.ozhera + ozhera-tspandata + 2.0.0-SNAPSHOT + + + org.apache.logging.log4j log4j-core diff --git a/trace-etl/trace-etl-api/pom.xml b/trace-etl/trace-etl-api/pom.xml index ec256a2c9..b23e876a3 100644 --- a/trace-etl/trace-etl-api/pom.xml +++ b/trace-etl/trace-etl-api/pom.xml @@ -31,7 +31,7 @@ - run.mone + org.apache.ozhera ozhera-tspandata