This is an automated email from the ASF dual-hosted git repository.
gaoxihui pushed a commit to branch release-2.2.5-incubating-rc1
in repository https://gitbox.apache.org/repos/asf/ozhera.git
The following commit(s) were added to refs/heads/release-2.2.5-incubating-rc1
by this push:
new 1336d8b8 feat: prepare release 2.2.5-incubating-rc1
1336d8b8 is described below
commit 1336d8b821dcc91e0e99d648aeb3682968503489
Author: gaoxihui <[email protected]>
AuthorDate: Thu Dec 12 17:06:45 2024 +0800
feat: prepare release 2.2.5-incubating-rc1
---
DISCLAIMER | 21 +++++++++
ozhera-app/app-api/pom.xml | 20 ++++++---
ozhera-app/app-common/pom.xml | 21 ++++++---
ozhera-app/app-server/pom.xml | 22 ++++-----
ozhera-app/app-service/pom.xml | 23 +++++++---
ozhera-app/pom.xml | 20 +++------
ozhera-demo-client/ozhera-demo-client-api/pom.xml | 21 ++++++---
.../ozhera-demo-client-common/pom.xml | 19 ++++++--
.../ozhera-demo-client-server/pom.xml | 18 +++++---
.../ozhera-demo-client-service/pom.xml | 18 ++++++--
ozhera-demo-client/pom.xml | 20 ++++-----
ozhera-demo-server/ozhera-demo-server-api/pom.xml | 19 ++++++--
.../ozhera-demo-server-server/pom.xml | 18 +++++---
ozhera-demo-server/pom.xml | 12 +++--
.../ozhera-intelligence-domain/pom.xml | 19 ++++++--
.../ozhera-intelligence-server/pom.xml | 16 +++----
.../ozhera-intelligence-service/pom.xml | 21 ++++++---
ozhera-intelligence/pom.xml | 14 +++---
ozhera-log/log-agent-server/pom.xml | 18 +++++---
ozhera-log/log-agent/pom.xml | 14 +++---
ozhera-log/log-api/pom.xml | 21 ++++++---
ozhera-log/log-common/pom.xml | 20 +++++++--
ozhera-log/log-manager/pom.xml | 16 +++----
ozhera-log/log-stream/pom.xml | 20 ++++++---
ozhera-log/pom.xml | 52 +++++++++++-----------
ozhera-monitor/ozhera-monitor-api/pom.xml | 19 ++++++--
ozhera-monitor/ozhera-monitor-common/pom.xml | 19 ++++++--
ozhera-monitor/ozhera-monitor-server/pom.xml | 25 +++--------
ozhera-monitor/ozhera-monitor-service/pom.xml | 17 +++++--
ozhera-monitor/pom.xml | 24 +++++-----
ozhera-operator/ozhera-operator-common/pom.xml | 19 ++++++--
ozhera-operator/ozhera-operator-server/pom.xml | 18 ++++++--
ozhera-operator/ozhera-operator-service/pom.xml | 19 ++++++--
ozhera-operator/pom.xml | 14 +++---
.../ozhera-prometheus-agent-api/pom.xml | 21 ++++++---
.../ozhera-prometheus-agent-client/pom.xml | 18 ++++++--
.../ozhera-prometheus-agent-common/pom.xml | 19 ++++++--
.../ozhera-prometheus-agent-dao/pom.xml | 19 ++++++--
.../ozhera-prometheus-agent-server/pom.xml | 42 +++++++----------
.../ozhera-prometheus-agent-service/pom.xml | 19 ++++++--
ozhera-prometheus-agent/pom.xml | 10 ++---
ozhera-tspandata/pom.xml | 39 +++++++++++++---
ozhera-webhook/ozhera-webhook-server/pom.xml | 19 ++++++--
ozhera-webhook/pom.xml | 27 ++++++++---
pom.xml | 47 ++++++++++++++++---
prometheus-starter-all/pom.xml | 14 ++----
.../prometheus-diy-client/pom.xml | 20 ++++++---
.../prometheus-diy-starter/pom.xml | 23 +++++++---
trace-etl/pom.xml | 18 ++++----
trace-etl/trace-etl-api/pom.xml | 19 +++++---
trace-etl/trace-etl-common/pom.xml | 18 ++++++--
trace-etl/trace-etl-dao/pom.xml | 19 ++++++--
trace-etl/trace-etl-domain/pom.xml | 19 ++++++--
trace-etl/trace-etl-es/pom.xml | 20 ++++++---
trace-etl/trace-etl-extensions/pom.xml | 8 ++--
.../trace-etl-doris-extension/pom.xml | 19 ++++++--
.../trace-etl-es-extension/pom.xml | 18 ++++++--
.../trace-etl-kafka-extension/pom.xml | 20 +++++++--
.../trace-etl-rocketmq-extension/pom.xml | 19 ++++++--
trace-etl/trace-etl-manager/pom.xml | 14 +++---
trace-etl/trace-etl-metadata/pom.xml | 18 +++++---
trace-etl/trace-etl-nginx/pom.xml | 18 +++++---
trace-etl/trace-etl-server/pom.xml | 14 +++---
trace-etl/trace-etl-service/pom.xml | 19 ++++++--
64 files changed, 866 insertions(+), 428 deletions(-)
diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 00000000..b7b2fe97
--- /dev/null
+++ b/DISCLAIMER
@@ -0,0 +1,21 @@
+Apache OzHera (incubating) is an effort undergoing incubation at The Apache
+Software Foundation (ASF), sponsored by the Apache Incubator.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects.
+
+While incubation status is not necessarily a reflection of the completeness or
+stability of the code, it does indicate that the project has yet to be fully
+endorsed by the ASF.
+
+Some of the incubating project’s releases may not be fully compliant with ASF
+policy. For example, releases may have incomplete or un-reviewed licensing
+conditions.
+
+If you are planning to incorporate this work into your product/project, please
+be aware that you will need to conduct a thorough licensing review to determine
+the overall implications of including this work. For the current status of this
+project through the Apache Incubator visit:
+https://incubator.apache.org/projects/ozhera.html
+
diff --git a/ozhera-app/app-api/pom.xml b/ozhera-app/app-api/pom.xml
index bd62c724..04bf5946 100644
--- a/ozhera-app/app-api/pom.xml
+++ b/ozhera-app/app-api/pom.xml
@@ -19,14 +19,12 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-app</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -36,7 +34,7 @@
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>app-common</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -44,5 +42,17 @@
<artifactId>lombok</artifactId>
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
</project>
\ No newline at end of file
diff --git a/ozhera-app/app-common/pom.xml b/ozhera-app/app-common/pom.xml
index 9b028c45..b941510c 100644
--- a/ozhera-app/app-common/pom.xml
+++ b/ozhera-app/app-common/pom.xml
@@ -19,18 +19,16 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-app</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>app-common</artifactId>
- <version>${hera-app.release.version}</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -50,4 +48,17 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/ozhera-app/app-server/pom.xml b/ozhera-app/app-server/pom.xml
index d10e43fc..c5062518 100644
--- a/ozhera-app/app-server/pom.xml
+++ b/ozhera-app/app-server/pom.xml
@@ -19,19 +19,17 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-app</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>app-server</artifactId>
- <version>${hera-app.release.version}</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<properties>
<maven.compiler.source>21</maven.compiler.source>
@@ -92,9 +90,9 @@
<profiles>
<profile>
- <id>open</id>
+ <id>apache-release</id>
<properties>
- <profileActive>open</profileActive>
+ <profileActive>apache-release</profileActive>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
@@ -110,10 +108,10 @@
<filtering>true</filtering>
</resource>
<resource>
- <directory>src/main/resources/META-INF</directory>
+ <directory>${project.basedir}/../../</directory>
<filtering>true</filtering>
<includes>
- <include>app.properties</include>
+ <include>DISCLAIMER</include>
</includes>
<targetPath>META-INF/</targetPath>
</resource>
@@ -141,9 +139,9 @@
<profile>
<id>opensource-deploy</id>
- <activation>
+ <!-- <activation>
<activeByDefault>true</activeByDefault>
- </activation>
+ </activation>-->
<properties>
<profileActive>opensource-deploy</profileActive>
</properties>
@@ -163,8 +161,6 @@
</build>
</profile>
-
-
</profiles>
</project>
\ No newline at end of file
diff --git a/ozhera-app/app-service/pom.xml b/ozhera-app/app-service/pom.xml
index 55726987..3bcfac0f 100644
--- a/ozhera-app/app-service/pom.xml
+++ b/ozhera-app/app-service/pom.xml
@@ -19,18 +19,16 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-app</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>app-service</artifactId>
- <version>${hera-app.release.version}</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<properties>
<maven.compiler.source>21</maven.compiler.source>
@@ -41,7 +39,7 @@
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>app-api</artifactId>
- <version>${hera-app.release.version}</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<!-- mybatis-plus -->
<dependency>
@@ -184,4 +182,17 @@
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/ozhera-app/pom.xml b/ozhera-app/pom.xml
index fe515b87..022251b7 100644
--- a/ozhera-app/pom.xml
+++ b/ozhera-app/pom.xml
@@ -19,19 +19,17 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<artifactId>ozhera-app</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -41,26 +39,22 @@
<module>app-common</module>
</modules>
- <properties>
- <hera-app.release.version>2.0.0-SNAPSHOT</hera-app.release.version>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>app-api</artifactId>
- <version>${hera-app.release.version}</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>app-service</artifactId>
- <version>${hera-app.release.version}</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>app-server</artifactId>
- <version>${hera-app.release.version}</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<!-- inner module -->
</dependencies>
@@ -167,7 +161,7 @@
</goals>
<configuration>
<executable>gpg</executable>
- <keyname>your-gpg-key</keyname>
+
<keyname>C962B99B87C5B41E79940E4BE72ADFA74291C3C0</keyname>
</configuration>
</execution>
</executions>
diff --git a/ozhera-demo-client/ozhera-demo-client-api/pom.xml
b/ozhera-demo-client/ozhera-demo-client-api/pom.xml
index 0352da81..01092792 100644
--- a/ozhera-demo-client/ozhera-demo-client-api/pom.xml
+++ b/ozhera-demo-client/ozhera-demo-client-api/pom.xml
@@ -20,19 +20,17 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ozhera-demo-client-api</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<dependencies>
@@ -43,5 +41,18 @@
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/ozhera-demo-client/ozhera-demo-client-common/pom.xml
b/ozhera-demo-client/ozhera-demo-client-common/pom.xml
index b06147fd..627703bc 100644
--- a/ozhera-demo-client/ozhera-demo-client-common/pom.xml
+++ b/ozhera-demo-client/ozhera-demo-client-common/pom.xml
@@ -20,14 +20,12 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -68,5 +66,18 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/ozhera-demo-client/ozhera-demo-client-server/pom.xml
b/ozhera-demo-client/ozhera-demo-client-server/pom.xml
index 78ce108c..be1ad56d 100644
--- a/ozhera-demo-client/ozhera-demo-client-server/pom.xml
+++ b/ozhera-demo-client/ozhera-demo-client-server/pom.xml
@@ -20,13 +20,11 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -158,6 +156,14 @@
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
</resources>
<plugins>
@@ -202,9 +208,9 @@
<profiles>
<profile>
- <id>open-source</id>
+ <id>apache-release</id>
<properties>
- <profiles.active>open-source</profiles.active>
+ <profiles.active>apache-release</profiles.active>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
diff --git a/ozhera-demo-client/ozhera-demo-client-service/pom.xml
b/ozhera-demo-client/ozhera-demo-client-service/pom.xml
index 4a303d44..d3ff1e32 100644
--- a/ozhera-demo-client/ozhera-demo-client-service/pom.xml
+++ b/ozhera-demo-client/ozhera-demo-client-service/pom.xml
@@ -20,13 +20,11 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -105,5 +103,17 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
</project>
\ No newline at end of file
diff --git a/ozhera-demo-client/pom.xml b/ozhera-demo-client/pom.xml
index b99352d3..9bb73cca 100644
--- a/ozhera-demo-client/pom.xml
+++ b/ozhera-demo-client/pom.xml
@@ -20,19 +20,17 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ozhera-demo-client</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -57,22 +55,22 @@
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-demo-server-api</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-demo-client-api</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-demo-client-service</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-demo-client-common</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -83,7 +81,7 @@
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>prometheus-diy-starter</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -214,7 +212,7 @@
</goals>
<configuration>
<executable>gpg</executable>
- <keyname>your-gpg-key</keyname>
+
<keyname>C962B99B87C5B41E79940E4BE72ADFA74291C3C0</keyname>
</configuration>
</execution>
</executions>
diff --git a/ozhera-demo-server/ozhera-demo-server-api/pom.xml
b/ozhera-demo-server/ozhera-demo-server-api/pom.xml
index 9e652c8c..2889444b 100644
--- a/ozhera-demo-server/ozhera-demo-server-api/pom.xml
+++ b/ozhera-demo-server/ozhera-demo-server-api/pom.xml
@@ -20,14 +20,12 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -41,5 +39,18 @@
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/ozhera-demo-server/ozhera-demo-server-server/pom.xml
b/ozhera-demo-server/ozhera-demo-server-server/pom.xml
index 808b0c74..faeda340 100644
--- a/ozhera-demo-server/ozhera-demo-server-server/pom.xml
+++ b/ozhera-demo-server/ozhera-demo-server-server/pom.xml
@@ -20,13 +20,11 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -131,9 +129,9 @@
<profiles>
<profile>
- <id>open-source</id>
+ <id>apache-release</id>
<properties>
- <profiles.active>open-source</profiles.active>
+ <profiles.active>apache-release</profiles.active>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
@@ -160,6 +158,14 @@
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
</resources>
<plugins>
<plugin>
diff --git a/ozhera-demo-server/pom.xml b/ozhera-demo-server/pom.xml
index 5c3b39f0..aa4f8f89 100644
--- a/ozhera-demo-server/pom.xml
+++ b/ozhera-demo-server/pom.xml
@@ -20,19 +20,17 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ozhera-demo-server</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -61,7 +59,7 @@
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-demo-server-api</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -174,7 +172,7 @@
</goals>
<configuration>
<executable>gpg</executable>
- <keyname>your-gpg-key</keyname>
+
<keyname>C962B99B87C5B41E79940E4BE72ADFA74291C3C0</keyname>
</configuration>
</execution>
</executions>
diff --git a/ozhera-intelligence/ozhera-intelligence-domain/pom.xml
b/ozhera-intelligence/ozhera-intelligence-domain/pom.xml
index 7b9e024d..b1260e50 100644
--- a/ozhera-intelligence/ozhera-intelligence-domain/pom.xml
+++ b/ozhera-intelligence/ozhera-intelligence-domain/pom.xml
@@ -19,14 +19,12 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-intelligence</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<artifactId>ozhera-intelligence-domain</artifactId>
@@ -44,4 +42,17 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
</project>
\ No newline at end of file
diff --git a/ozhera-intelligence/ozhera-intelligence-server/pom.xml
b/ozhera-intelligence/ozhera-intelligence-server/pom.xml
index 1b46d287..81e4d071 100644
--- a/ozhera-intelligence/ozhera-intelligence-server/pom.xml
+++ b/ozhera-intelligence/ozhera-intelligence-server/pom.xml
@@ -19,14 +19,12 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-intelligence</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<artifactId>ozhera-intelligence-server</artifactId>
@@ -41,7 +39,7 @@
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-intelligence-service</artifactId>
- <version>${ozhera.intelligence.version}</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -53,10 +51,10 @@
<filtering>true</filtering>
</resource>
<resource>
- <directory>src/main/resources/META-INF</directory>
+ <directory>${project.basedir}/../../</directory>
<filtering>true</filtering>
<includes>
- <include>app.properties</include>
+ <include>DISCLAIMER</include>
</includes>
<targetPath>META-INF/</targetPath>
</resource>
@@ -98,9 +96,9 @@
<profiles>
<profile>
- <id>opensource-outer</id>
+ <id>apache-release</id>
<properties>
- <profiles.active>opensource-outer</profiles.active>
+ <profiles.active>apache-release</profiles.active>
</properties>
<build>
<filters>
diff --git a/ozhera-intelligence/ozhera-intelligence-service/pom.xml
b/ozhera-intelligence/ozhera-intelligence-service/pom.xml
index 7662b172..d3505c42 100644
--- a/ozhera-intelligence/ozhera-intelligence-service/pom.xml
+++ b/ozhera-intelligence/ozhera-intelligence-service/pom.xml
@@ -19,14 +19,12 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-intelligence</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<artifactId>ozhera-intelligence-service</artifactId>
@@ -41,7 +39,7 @@
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-intelligence-domain</artifactId>
- <version>${ozhera.intelligence.version}</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<!-- spring -->
<dependency>
@@ -91,4 +89,17 @@
<artifactId>lombok</artifactId>
</dependency>
</dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
</project>
\ No newline at end of file
diff --git a/ozhera-intelligence/pom.xml b/ozhera-intelligence/pom.xml
index 94163f43..ad5647a6 100644
--- a/ozhera-intelligence/pom.xml
+++ b/ozhera-intelligence/pom.xml
@@ -19,18 +19,16 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<artifactId>ozhera-intelligence</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -43,8 +41,6 @@
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<spring.version>5.3.29</spring.version>
- <trace.etl.domain.version>1.0.1-jdk21</trace.etl.domain.version>
-
<ozhera.intelligence.version>2.0.0-SNAPSHOT</ozhera.intelligence.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Replace it with the absolute path of your own trace-etl project.
issue#19-->
<maven.jcommonDirectory>~</maven.jcommonDirectory>
@@ -70,7 +66,7 @@
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>trace-etl-domain</artifactId>
- <version>${trace.etl.domain.version}</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -163,7 +159,7 @@
</goals>
<configuration>
<executable>gpg</executable>
- <keyname>your-gpg-key</keyname>
+
<keyname>C962B99B87C5B41E79940E4BE72ADFA74291C3C0</keyname>
</configuration>
</execution>
</executions>
diff --git a/ozhera-log/log-agent-server/pom.xml
b/ozhera-log/log-agent-server/pom.xml
index e2e45248..8abf3de9 100644
--- a/ozhera-log/log-agent-server/pom.xml
+++ b/ozhera-log/log-agent-server/pom.xml
@@ -19,13 +19,11 @@ http://www.apache.org/licenses/LICENSE-2.0
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -144,6 +142,14 @@ http://www.apache.org/licenses/LICENSE-2.0
<exclude>config/*.properties</exclude>
</excludes>
</resource>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
</resources>
<plugins>
@@ -193,9 +199,9 @@ http://www.apache.org/licenses/LICENSE-2.0
<profiles>
<profile>
- <id>open</id>
+ <id>apache-release</id>
<properties>
- <profiles.active>open</profiles.active>
+ <profiles.active>apache-release</profiles.active>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
diff --git a/ozhera-log/log-agent/pom.xml b/ozhera-log/log-agent/pom.xml
index 715b361a..c591f017 100644
--- a/ozhera-log/log-agent/pom.xml
+++ b/ozhera-log/log-agent/pom.xml
@@ -19,13 +19,11 @@ http://www.apache.org/licenses/LICENSE-2.0
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -191,10 +189,10 @@ http://www.apache.org/licenses/LICENSE-2.0
<filtering>true</filtering>
</resource>
<resource>
- <directory>src/main/resources/META-INF</directory>
+ <directory>${project.basedir}/../../</directory>
<filtering>true</filtering>
<includes>
- <include>app.properties</include>
+ <include>DISCLAIMER</include>
</includes>
<targetPath>META-INF/</targetPath>
</resource>
@@ -246,9 +244,9 @@ http://www.apache.org/licenses/LICENSE-2.0
<profiles>
<profile>
- <id>open</id>
+ <id>apache-release</id>
<properties>
- <profiles.active>open</profiles.active>
+ <profiles.active>apache-release</profiles.active>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
diff --git a/ozhera-log/log-api/pom.xml b/ozhera-log/log-api/pom.xml
index 81a36684..dd5a7cc0 100644
--- a/ozhera-log/log-api/pom.xml
+++ b/ozhera-log/log-api/pom.xml
@@ -19,13 +19,11 @@ http://www.apache.org/licenses/LICENSE-2.0
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -35,6 +33,17 @@ http://www.apache.org/licenses/LICENSE-2.0
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
- <dependencies>
- </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/ozhera-log/log-common/pom.xml b/ozhera-log/log-common/pom.xml
index 70046566..a533628b 100644
--- a/ozhera-log/log-common/pom.xml
+++ b/ozhera-log/log-common/pom.xml
@@ -19,13 +19,11 @@ http://www.apache.org/licenses/LICENSE-2.0
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<artifactId>log-common</artifactId>
@@ -82,4 +80,18 @@ http://www.apache.org/licenses/LICENSE-2.0
<artifactId>kafka-clients</artifactId>
</dependency>
</dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/ozhera-log/log-manager/pom.xml b/ozhera-log/log-manager/pom.xml
index 9015576d..22595261 100644
--- a/ozhera-log/log-manager/pom.xml
+++ b/ozhera-log/log-manager/pom.xml
@@ -19,18 +19,16 @@ http://www.apache.org/licenses/LICENSE-2.0
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>log-manager</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<properties>
<maven.compiler.source>21</maven.compiler.source>
@@ -301,10 +299,10 @@ http://www.apache.org/licenses/LICENSE-2.0
<filtering>true</filtering>
</resource>
<resource>
- <directory>src/main/resources/META-INF</directory>
+ <directory>${project.basedir}/../../</directory>
<filtering>true</filtering>
<includes>
- <include>app.properties</include>
+ <include>DISCLAIMER</include>
</includes>
<targetPath>META-INF/</targetPath>
</resource>
@@ -356,9 +354,9 @@ http://www.apache.org/licenses/LICENSE-2.0
<profiles>
<profile>
- <id>open</id>
+ <id>apache-release</id>
<properties>
- <profiles.active>open</profiles.active>
+ <profiles.active>apache-release</profiles.active>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
diff --git a/ozhera-log/log-stream/pom.xml b/ozhera-log/log-stream/pom.xml
index 3f584e93..f3e0e0e1 100644
--- a/ozhera-log/log-stream/pom.xml
+++ b/ozhera-log/log-stream/pom.xml
@@ -19,18 +19,16 @@ http://www.apache.org/licenses/LICENSE-2.0
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>log-stream</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<properties>
<maven.compiler.source>21</maven.compiler.source>
@@ -180,6 +178,14 @@ http://www.apache.org/licenses/LICENSE-2.0
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
</resources>
<plugins>
@@ -219,9 +225,9 @@ http://www.apache.org/licenses/LICENSE-2.0
<profiles>
<profile>
- <id>open</id>
+ <id>apache-release</id>
<properties>
- <profiles.active>open</profiles.active>
+ <profiles.active>apache-release</profiles.active>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
diff --git a/ozhera-log/pom.xml b/ozhera-log/pom.xml
index 392fcbb0..fa80ef26 100644
--- a/ozhera-log/pom.xml
+++ b/ozhera-log/pom.xml
@@ -19,19 +19,17 @@ http://www.apache.org/licenses/LICENSE-2.0
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<artifactId>ozhera-log</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -56,22 +54,22 @@ http://www.apache.org/licenses/LICENSE-2.0
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>log-api</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>log-common</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>app-api</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-tspandata</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -94,7 +92,7 @@ http://www.apache.org/licenses/LICENSE-2.0
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>app-api</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -190,23 +188,23 @@ http://www.apache.org/licenses/LICENSE-2.0
</executions>
</plugin>
-<!-- <plugin>-->
-<!-- <groupId>org.apache.maven.plugins</groupId>-->
-<!-- <artifactId>maven-gpg-plugin</artifactId>-->
-<!-- <version>1.6</version>-->
-<!-- <executions>-->
-<!-- <execution>-->
-<!-- <id>sign-artifacts</id>-->
-<!-- <phase>deploy</phase>-->
-<!-- <goals>-->
-<!-- <goal>sign</goal>-->
-<!-- </goals>-->
-<!-- <configuration>-->
-<!-- <keyname>your key name</keyname>-->
-<!-- </configuration>-->
-<!-- </execution>-->
-<!-- </executions>-->
-<!-- </plugin>-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <configuration>
+
<keyname>C962B99B87C5B41E79940E4BE72ADFA74291C3C0</keyname>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/ozhera-monitor/ozhera-monitor-api/pom.xml
b/ozhera-monitor/ozhera-monitor-api/pom.xml
index d2cdd957..3f6f2ecd 100644
--- a/ozhera-monitor/ozhera-monitor-api/pom.xml
+++ b/ozhera-monitor/ozhera-monitor-api/pom.xml
@@ -19,13 +19,11 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-monitor</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -44,4 +42,17 @@
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/ozhera-monitor/ozhera-monitor-common/pom.xml
b/ozhera-monitor/ozhera-monitor-common/pom.xml
index d32e6637..718740d4 100644
--- a/ozhera-monitor/ozhera-monitor-common/pom.xml
+++ b/ozhera-monitor/ozhera-monitor-common/pom.xml
@@ -19,13 +19,11 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-monitor</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -58,4 +56,17 @@
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/ozhera-monitor/ozhera-monitor-server/pom.xml
b/ozhera-monitor/ozhera-monitor-server/pom.xml
index 445e0729..329717e0 100644
--- a/ozhera-monitor/ozhera-monitor-server/pom.xml
+++ b/ozhera-monitor/ozhera-monitor-server/pom.xml
@@ -19,13 +19,11 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-monitor</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -57,12 +55,12 @@
<profiles>
<profile>
- <id>opensource-outer</id>
+ <id>apache-release</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
- <profileActive>opensource-outer</profileActive>
+ <profileActive>apache-release</profileActive>
</properties>
<build>
<filters>
@@ -87,10 +85,10 @@
</includes>
</resource>
<resource>
- <directory>src/main/resources/META-INF</directory>
+ <directory>${project.basedir}/../../</directory>
<filtering>true</filtering>
<includes>
- <include>app.properties</include>
+ <include>DISCLAIMER</include>
</includes>
<targetPath>META-INF/</targetPath>
</resource>
@@ -118,9 +116,6 @@
<profile>
<id>opensource-deploy</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<properties>
<profileActive>opensource-deploy</profileActive>
</properties>
@@ -146,14 +141,6 @@
<include>logback.xml</include>
</includes>
</resource>
- <resource>
- <directory>src/main/resources/META-INF</directory>
- <filtering>true</filtering>
- <includes>
- <include>app.properties</include>
- </includes>
- <targetPath>META-INF/</targetPath>
- </resource>
</resources>
</build>
diff --git a/ozhera-monitor/ozhera-monitor-service/pom.xml
b/ozhera-monitor/ozhera-monitor-service/pom.xml
index 5525cab5..39358ff4 100644
--- a/ozhera-monitor/ozhera-monitor-service/pom.xml
+++ b/ozhera-monitor/ozhera-monitor-service/pom.xml
@@ -19,13 +19,11 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-monitor</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -309,6 +307,17 @@
</dependencies>
</plugin>
</plugins>
+
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
</build>
</project>
\ No newline at end of file
diff --git a/ozhera-monitor/pom.xml b/ozhera-monitor/pom.xml
index f994ba28..a466e4a8 100644
--- a/ozhera-monitor/pom.xml
+++ b/ozhera-monitor/pom.xml
@@ -19,20 +19,18 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<artifactId>ozhera-monitor</artifactId>
<packaging>pom</packaging>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<modules>
<module>ozhera-monitor-server</module>
<module>ozhera-monitor-service</module>
@@ -53,41 +51,41 @@
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>app-api</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>app-common</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>log-api</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-prometheus-agent-api</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-monitor-api</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-monitor-common</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-monitor-service</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -179,7 +177,7 @@
</goals>
<configuration>
<executable>gpg</executable>
- <keyname>your-gpg-key</keyname>
+
<keyname>C962B99B87C5B41E79940E4BE72ADFA74291C3C0</keyname>
</configuration>
</execution>
</executions>
diff --git a/ozhera-operator/ozhera-operator-common/pom.xml
b/ozhera-operator/ozhera-operator-common/pom.xml
index 6a30933f..64578052 100644
--- a/ozhera-operator/ozhera-operator-common/pom.xml
+++ b/ozhera-operator/ozhera-operator-common/pom.xml
@@ -19,13 +19,11 @@ http://www.apache.org/licenses/LICENSE-2.0
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-operator</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -63,4 +61,17 @@ http://www.apache.org/licenses/LICENSE-2.0
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
</project>
\ No newline at end of file
diff --git a/ozhera-operator/ozhera-operator-server/pom.xml
b/ozhera-operator/ozhera-operator-server/pom.xml
index c67902d7..e93955a0 100644
--- a/ozhera-operator/ozhera-operator-server/pom.xml
+++ b/ozhera-operator/ozhera-operator-server/pom.xml
@@ -19,13 +19,11 @@ http://www.apache.org/licenses/LICENSE-2.0
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-operator</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -72,6 +70,18 @@ http://www.apache.org/licenses/LICENSE-2.0
<build>
+
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/ozhera-operator/ozhera-operator-service/pom.xml
b/ozhera-operator/ozhera-operator-service/pom.xml
index 62a32215..dd944a7d 100644
--- a/ozhera-operator/ozhera-operator-service/pom.xml
+++ b/ozhera-operator/ozhera-operator-service/pom.xml
@@ -19,13 +19,11 @@ http://www.apache.org/licenses/LICENSE-2.0
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-operator</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -110,5 +108,18 @@ http://www.apache.org/licenses/LICENSE-2.0
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/ozhera-operator/pom.xml b/ozhera-operator/pom.xml
index 25eeab71..18920214 100644
--- a/ozhera-operator/pom.xml
+++ b/ozhera-operator/pom.xml
@@ -19,20 +19,18 @@ http://www.apache.org/licenses/LICENSE-2.0
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<artifactId>ozhera-operator</artifactId>
<packaging>pom</packaging>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<modules>
<module>ozhera-operator-common</module>
<module>ozhera-operator-service</module>
@@ -44,12 +42,12 @@ http://www.apache.org/licenses/LICENSE-2.0
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-operator-service</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-operator-common</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
@@ -137,7 +135,7 @@ http://www.apache.org/licenses/LICENSE-2.0
</goals>
<configuration>
<executable>gpg</executable>
- <keyname>your-gpg-key</keyname>
+
<keyname>C962B99B87C5B41E79940E4BE72ADFA74291C3C0</keyname>
</configuration>
</execution>
</executions>
diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-api/pom.xml
b/ozhera-prometheus-agent/ozhera-prometheus-agent-api/pom.xml
index bdf05bea..04d751c9 100644
--- a/ozhera-prometheus-agent/ozhera-prometheus-agent-api/pom.xml
+++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-api/pom.xml
@@ -20,18 +20,17 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-prometheus-agent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ozhera-prometheus-agent-api</artifactId>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<dependencies>
@@ -39,7 +38,7 @@
<dependency>
<artifactId>ozhera-prometheus-agent-common</artifactId>
<groupId>org.apache.ozhera</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -54,6 +53,18 @@
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
</project>
\ No newline at end of file
diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/pom.xml
b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/pom.xml
index ddb7e887..b485e683 100644
--- a/ozhera-prometheus-agent/ozhera-prometheus-agent-client/pom.xml
+++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-client/pom.xml
@@ -20,14 +20,12 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-prometheus-agent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -72,5 +70,17 @@
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
</project>
\ No newline at end of file
diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/pom.xml
b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/pom.xml
index 6eb045b3..560128e5 100644
--- a/ozhera-prometheus-agent/ozhera-prometheus-agent-common/pom.xml
+++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-common/pom.xml
@@ -20,14 +20,12 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-prometheus-agent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -179,5 +177,18 @@
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/pom.xml
b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/pom.xml
index 5bf7a088..9bb019b6 100644
--- a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/pom.xml
+++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/pom.xml
@@ -20,14 +20,12 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-prometheus-agent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -67,5 +65,18 @@
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/pom.xml
b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/pom.xml
index 5e7ab797..d6f57093 100644
--- a/ozhera-prometheus-agent/ozhera-prometheus-agent-server/pom.xml
+++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-server/pom.xml
@@ -20,13 +20,11 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-prometheus-agent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ozhera-prometheus-agent-server</artifactId>
@@ -75,31 +73,23 @@
<build>
-
-<!-- <resources>-->
-<!-- <resource>-->
-<!-- <directory>src/main/resources</directory>-->
-<!-- <filtering>true</filtering>-->
-<!-- </resource>-->
-<!-- <resource>-->
-<!-- <directory>src/main/resources/META-INF</directory>-->
-<!-- <filtering>true</filtering>-->
-<!-- <includes>-->
-<!-- <include>app.properties</include>-->
-<!-- </includes>-->
-<!-- <targetPath>META-INF/</targetPath>-->
-<!-- </resource>-->
-<!-- </resources>-->
-
-
-
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
</build>
<profiles>
<profile>
- <id>opensource-outer</id>
+ <id>apache-release</id>
<properties>
- <profiles.active>opensource-outer</profiles.active>
+ <profiles.active>apache-release</profiles.active>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
@@ -161,9 +151,9 @@
<profile>
<id>opensource-deploy</id>
- <activation>
+ <!-- <activation>
<activeByDefault>true</activeByDefault>
- </activation>
+ </activation>-->
<properties>
<profileActive>opensource-deploy</profileActive>
</properties>
diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/pom.xml
b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/pom.xml
index 26f82797..196f157a 100644
--- a/ozhera-prometheus-agent/ozhera-prometheus-agent-service/pom.xml
+++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-service/pom.xml
@@ -20,13 +20,11 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-prometheus-agent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -148,5 +146,18 @@
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/ozhera-prometheus-agent/pom.xml b/ozhera-prometheus-agent/pom.xml
index 1be7108c..e3482b4d 100644
--- a/ozhera-prometheus-agent/pom.xml
+++ b/ozhera-prometheus-agent/pom.xml
@@ -20,19 +20,17 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ozhera-prometheus-agent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -214,7 +212,7 @@
</goals>
<configuration>
<executable>gpg</executable>
- <keyname>your gpg key</keyname>
+
<keyname>C962B99B87C5B41E79940E4BE72ADFA74291C3C0</keyname>
</configuration>
</execution>
</executions>
diff --git a/ozhera-tspandata/pom.xml b/ozhera-tspandata/pom.xml
index 8bf86705..911ab183 100644
--- a/ozhera-tspandata/pom.xml
+++ b/ozhera-tspandata/pom.xml
@@ -20,22 +20,32 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ozhera-tspandata</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<build>
+
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -48,6 +58,25 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <configuration>
+ <executable>gpg</executable>
+
<keyname>C962B99B87C5B41E79940E4BE72ADFA74291C3C0</keyname>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
diff --git a/ozhera-webhook/ozhera-webhook-server/pom.xml
b/ozhera-webhook/ozhera-webhook-server/pom.xml
index 01e73782..03d82679 100644
--- a/ozhera-webhook/ozhera-webhook-server/pom.xml
+++ b/ozhera-webhook/ozhera-webhook-server/pom.xml
@@ -19,13 +19,11 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-webhook</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -114,6 +112,19 @@
</dependencies>
<build>
+
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+
+
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/ozhera-webhook/pom.xml b/ozhera-webhook/pom.xml
index 7961e4c6..0f03b79b 100644
--- a/ozhera-webhook/pom.xml
+++ b/ozhera-webhook/pom.xml
@@ -19,20 +19,18 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ozhera-webhook</artifactId>
<packaging>pom</packaging>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<modules>
<module>ozhera-webhook-server</module>
@@ -125,6 +123,25 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <configuration>
+ <executable>gpg</executable>
+
<keyname>C962B99B87C5B41E79940E4BE72ADFA74291C3C0</keyname>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
diff --git a/pom.xml b/pom.xml
index c364802c..9f5ab098 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,21 +19,19 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>31</version>
- <relativePath/>
+ <relativePath />
</parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
@@ -1076,10 +1074,29 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <configuration>
+ <executable>gpg</executable>
+
<keyname>C962B99B87C5B41E79940E4BE72ADFA74291C3C0</keyname>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
- <distributionManagement>
+ <!--<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
@@ -1088,7 +1105,23 @@
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
- </distributionManagement>
+ </distributionManagement>-->
+ <distributionManagement>
+ <snapshotRepository>
+ <id>apache.snapshots.https</id>
+
<url>https://repository.apache.org/content/repositories/snapshots/</url>
+ </snapshotRepository>
+ <repository>
+ <id>apache.releases.https</id>
+
<url>https://repository.apache.org/service/local/staging/deploy/maven2/</url>
+ </repository>
+ </distributionManagement>
+ <scm>
+ <url>https://github.com/apache/ozhera</url>
+ <connection>scm:git:https://github.com/apache/ozhera.git</connection>
+
<developerConnection>scm:git:https://github.com/apache/ozhera.git</developerConnection>
+ <tag>HEAD</tag>
+ </scm>
</project>
\ No newline at end of file
diff --git a/prometheus-starter-all/pom.xml b/prometheus-starter-all/pom.xml
index 7db22963..ed1c25a5 100644
--- a/prometheus-starter-all/pom.xml
+++ b/prometheus-starter-all/pom.xml
@@ -20,20 +20,18 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>prometheus-starter-all</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -41,10 +39,6 @@
<module>prometheus-diy-starter</module>
</modules>
- <properties>
- <prometheus-all.version>2.0.0-SNAPSHOT</prometheus-all.version>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -151,7 +145,7 @@
</goals>
<configuration>
<executable>gpg</executable>
- <keyname>your-gpg-key</keyname>
+
<keyname>C962B99B87C5B41E79940E4BE72ADFA74291C3C0</keyname>
</configuration>
</execution>
</executions>
diff --git a/prometheus-starter-all/prometheus-diy-client/pom.xml
b/prometheus-starter-all/prometheus-diy-client/pom.xml
index e3258952..0af87c9d 100644
--- a/prometheus-starter-all/prometheus-diy-client/pom.xml
+++ b/prometheus-starter-all/prometheus-diy-client/pom.xml
@@ -20,18 +20,16 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>prometheus-starter-all</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>prometheus-diy-client</artifactId>
- <version>${prometheus-all.version}</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<dependencies>
<dependency>
@@ -68,6 +66,18 @@
</dependencies>
<build>
+
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/prometheus-starter-all/prometheus-diy-starter/pom.xml
b/prometheus-starter-all/prometheus-diy-starter/pom.xml
index 0d58bb3c..7897b46c 100644
--- a/prometheus-starter-all/prometheus-diy-starter/pom.xml
+++ b/prometheus-starter-all/prometheus-diy-starter/pom.xml
@@ -20,25 +20,23 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>prometheus-starter-all</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>prometheus-diy-starter</artifactId>
- <version>${prometheus-all.version}</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>prometheus-diy-client</artifactId>
- <version>${prometheus-all.version}</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -53,5 +51,18 @@
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/trace-etl/pom.xml b/trace-etl/pom.xml
index 8684b27d..d87dedfc 100644
--- a/trace-etl/pom.xml
+++ b/trace-etl/pom.xml
@@ -20,19 +20,17 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>trace-etl</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -97,7 +95,7 @@
<dependency>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-tspandata</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</dependency>
@@ -228,10 +226,10 @@
<goals>
<goal>sign</goal>
</goals>
-<!-- <configuration>-->
-<!-- <executable>gpg</executable>-->
-<!-- <keyname>your-gpg-key</keyname>-->
-<!-- </configuration>-->
+ <configuration>
+ <executable>gpg</executable>
+
<keyname>C962B99B87C5B41E79940E4BE72ADFA74291C3C0</keyname>
+ </configuration>
</execution>
</executions>
</plugin>
diff --git a/trace-etl/trace-etl-api/pom.xml b/trace-etl/trace-etl-api/pom.xml
index d1384cf0..634f1ab7 100644
--- a/trace-etl/trace-etl-api/pom.xml
+++ b/trace-etl/trace-etl-api/pom.xml
@@ -20,14 +20,12 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
<artifactId>trace-etl</artifactId>
<groupId>org.apache.ozhera</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -59,6 +57,17 @@
</dependencies>
-
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
</project>
\ No newline at end of file
diff --git a/trace-etl/trace-etl-common/pom.xml
b/trace-etl/trace-etl-common/pom.xml
index 0c11bdfc..73bd4cd0 100644
--- a/trace-etl/trace-etl-common/pom.xml
+++ b/trace-etl/trace-etl-common/pom.xml
@@ -20,14 +20,12 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
<artifactId>trace-etl</artifactId>
<groupId>org.apache.ozhera</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -90,5 +88,17 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
</project>
\ No newline at end of file
diff --git a/trace-etl/trace-etl-dao/pom.xml b/trace-etl/trace-etl-dao/pom.xml
index 1fbf0141..9eb47e4b 100644
--- a/trace-etl/trace-etl-dao/pom.xml
+++ b/trace-etl/trace-etl-dao/pom.xml
@@ -20,13 +20,11 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
<artifactId>trace-etl</artifactId>
<groupId>org.apache.ozhera</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -65,4 +63,17 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/trace-etl/trace-etl-domain/pom.xml
b/trace-etl/trace-etl-domain/pom.xml
index a39d2a52..5e4d50a7 100644
--- a/trace-etl/trace-etl-domain/pom.xml
+++ b/trace-etl/trace-etl-domain/pom.xml
@@ -20,13 +20,11 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
<artifactId>trace-etl</artifactId>
<groupId>org.apache.ozhera</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -54,4 +52,17 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/trace-etl/trace-etl-es/pom.xml b/trace-etl/trace-etl-es/pom.xml
index 9e4b30d8..75dd7324 100644
--- a/trace-etl/trace-etl-es/pom.xml
+++ b/trace-etl/trace-etl-es/pom.xml
@@ -20,13 +20,11 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
<artifactId>trace-etl</artifactId>
<groupId>org.apache.ozhera</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -101,6 +99,16 @@
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
+
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+
</resources>
<plugins>
@@ -127,9 +135,9 @@
<profiles>
<profile>
- <id>opensource-outer</id>
+ <id>apache-release</id>
<properties>
- <profiles.active>opensource-outer</profiles.active>
+ <profiles.active>apache-release</profiles.active>
</properties>
<build>
<filters>
diff --git a/trace-etl/trace-etl-extensions/pom.xml
b/trace-etl/trace-etl-extensions/pom.xml
index bb829920..818e508f 100644
--- a/trace-etl/trace-etl-extensions/pom.xml
+++ b/trace-etl/trace-etl-extensions/pom.xml
@@ -20,18 +20,16 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozhera</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<artifactId>trace-etl</artifactId>
</parent>
<artifactId>trace-etl-extensions</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>trace-etl-rocketmq-extension</module>
diff --git a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/pom.xml
b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/pom.xml
index cb2ba689..f012c7b7 100644
--- a/trace-etl/trace-etl-extensions/trace-etl-doris-extension/pom.xml
+++ b/trace-etl/trace-etl-extensions/trace-etl-doris-extension/pom.xml
@@ -20,14 +20,12 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>trace-etl-extensions</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<artifactId>trace-etl-doris-extension</artifactId>
@@ -50,4 +48,17 @@
<artifactId>storage-doris</artifactId>
</dependency>
</dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
</project>
\ No newline at end of file
diff --git a/trace-etl/trace-etl-extensions/trace-etl-es-extension/pom.xml
b/trace-etl/trace-etl-extensions/trace-etl-es-extension/pom.xml
index 76cb1746..3bfabf68 100644
--- a/trace-etl/trace-etl-extensions/trace-etl-es-extension/pom.xml
+++ b/trace-etl/trace-etl-extensions/trace-etl-es-extension/pom.xml
@@ -20,14 +20,12 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>trace-etl-extensions</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<artifactId>trace-etl-es-extension</artifactId>
@@ -63,4 +61,16 @@
</exclusions>
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
</project>
\ No newline at end of file
diff --git a/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/pom.xml
b/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/pom.xml
index 82dabfc9..33a287bd 100644
--- a/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/pom.xml
+++ b/trace-etl/trace-etl-extensions/trace-etl-kafka-extension/pom.xml
@@ -20,14 +20,12 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>trace-etl-extensions</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<artifactId>trace-etl-kafka-extension</artifactId>
@@ -73,4 +71,18 @@
</dependency>
</dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
diff --git
a/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/pom.xml
b/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/pom.xml
index 4f4d2954..530e8543 100644
--- a/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/pom.xml
+++ b/trace-etl/trace-etl-extensions/trace-etl-rocketmq-extension/pom.xml
@@ -20,14 +20,12 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>trace-etl-extensions</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<artifactId>trace-etl-rocketmq-extension</artifactId>
@@ -77,4 +75,17 @@
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/trace-etl/trace-etl-manager/pom.xml
b/trace-etl/trace-etl-manager/pom.xml
index fca87e1b..78a2caf7 100644
--- a/trace-etl/trace-etl-manager/pom.xml
+++ b/trace-etl/trace-etl-manager/pom.xml
@@ -20,13 +20,11 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
<artifactId>trace-etl</artifactId>
<groupId>org.apache.ozhera</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -60,10 +58,10 @@
<filtering>true</filtering>
</resource>
<resource>
- <directory>src/main/resources/META-INF</directory>
+ <directory>${project.basedir}/../../</directory>
<filtering>true</filtering>
<includes>
- <include>app.properties</include>
+ <include>DISCLAIMER</include>
</includes>
<targetPath>META-INF/</targetPath>
</resource>
@@ -93,9 +91,9 @@
<profiles>
<profile>
- <id>opensource-outer</id>
+ <id>apache-release</id>
<properties>
- <profiles.active>opensource-outer</profiles.active>
+ <profiles.active>apache-release</profiles.active>
</properties>
<build>
<filters>
diff --git a/trace-etl/trace-etl-metadata/pom.xml
b/trace-etl/trace-etl-metadata/pom.xml
index f1e03444..be9891d6 100644
--- a/trace-etl/trace-etl-metadata/pom.xml
+++ b/trace-etl/trace-etl-metadata/pom.xml
@@ -20,14 +20,12 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>trace-etl</artifactId>
<groupId>org.apache.ozhera</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<artifactId>trace-etl-metadata</artifactId>
@@ -59,6 +57,14 @@
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
</resources>
<plugins>
@@ -86,9 +92,9 @@
<profiles>
<profile>
- <id>opensource-outer</id>
+ <id>apache-release</id>
<properties>
- <profiles.active>opensource-outer</profiles.active>
+ <profiles.active>apache-release</profiles.active>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
diff --git a/trace-etl/trace-etl-nginx/pom.xml
b/trace-etl/trace-etl-nginx/pom.xml
index 8dd9c145..571aa79f 100644
--- a/trace-etl/trace-etl-nginx/pom.xml
+++ b/trace-etl/trace-etl-nginx/pom.xml
@@ -20,13 +20,11 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
<artifactId>trace-etl</artifactId>
<groupId>org.apache.ozhera</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -61,6 +59,14 @@
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
</resources>
<plugins>
@@ -87,9 +93,9 @@
<profiles>
<profile>
- <id>opensource-outer</id>
+ <id>apache-release</id>
<properties>
- <profiles.active>opensource-outer</profiles.active>
+ <profiles.active>apache-release</profiles.active>
</properties>
<build>
<filters>
diff --git a/trace-etl/trace-etl-server/pom.xml
b/trace-etl/trace-etl-server/pom.xml
index c046a093..1ab37199 100644
--- a/trace-etl/trace-etl-server/pom.xml
+++ b/trace-etl/trace-etl-server/pom.xml
@@ -20,13 +20,11 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
<artifactId>trace-etl</artifactId>
<groupId>org.apache.ozhera</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -80,10 +78,10 @@
<filtering>true</filtering>
</resource>
<resource>
- <directory>src/main/resources/META-INF</directory>
+ <directory>${project.basedir}/../../</directory>
<filtering>true</filtering>
<includes>
- <include>app.properties</include>
+ <include>DISCLAIMER</include>
</includes>
<targetPath>META-INF/</targetPath>
</resource>
@@ -125,9 +123,9 @@
<profiles>
<profile>
- <id>opensource-outer</id>
+ <id>apache-release</id>
<properties>
- <profiles.active>opensource-outer</profiles.active>
+ <profiles.active>apache-release</profiles.active>
</properties>
<build>
<filters>
diff --git a/trace-etl/trace-etl-service/pom.xml
b/trace-etl/trace-etl-service/pom.xml
index 08e33a23..728d3140 100644
--- a/trace-etl/trace-etl-service/pom.xml
+++ b/trace-etl/trace-etl-service/pom.xml
@@ -20,13 +20,11 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- 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";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
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>
<artifactId>trace-etl</artifactId>
<groupId>org.apache.ozhera</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.2.5-incubating-rc1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -228,5 +226,18 @@
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
+ </build>
+
</project>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
