From cba4dc5a3e87f458da6930b2d154e7273866285e Mon Sep 17 00:00:00 2001 From: Arthur Chern Date: Wed, 11 Jan 2023 01:48:44 +0800 Subject: [PATCH 1/3] chore: make version more maintainable and change it to 0.1.0 --- ceresdb-all/pom.xml | 2 +- ceresdb-common/pom.xml | 2 +- ceresdb-example/pom.xml | 2 +- ceresdb-grpc/pom.xml | 2 +- ceresdb-http/pom.xml | 2 +- ceresdb-protocol/pom.xml | 2 +- ceresdb-rpc/pom.xml | 2 +- ceresdb-sql-javacc/pom.xml | 2 +- ceresdb-sql/pom.xml | 2 +- pom.xml | 18 ++++++++---------- 10 files changed, 17 insertions(+), 19 deletions(-) diff --git a/ceresdb-all/pom.xml b/ceresdb-all/pom.xml index 6626045..55019da 100644 --- a/ceresdb-all/pom.xml +++ b/ceresdb-all/pom.xml @@ -4,7 +4,7 @@ ceresdb-client io.ceresdb - 0.1.0-RC + ${revision} ceresdb-all diff --git a/ceresdb-common/pom.xml b/ceresdb-common/pom.xml index f61b3f4..d5822f4 100644 --- a/ceresdb-common/pom.xml +++ b/ceresdb-common/pom.xml @@ -4,7 +4,7 @@ ceresdb-client io.ceresdb - 0.1.0-RC + ${revision} ceresdb-common diff --git a/ceresdb-example/pom.xml b/ceresdb-example/pom.xml index d849b8b..f168766 100644 --- a/ceresdb-example/pom.xml +++ b/ceresdb-example/pom.xml @@ -4,7 +4,7 @@ ceresdb-client io.ceresdb - 0.1.0-RC + ${revision} ceresdb-example diff --git a/ceresdb-grpc/pom.xml b/ceresdb-grpc/pom.xml index 55f6c8b..46f1e8a 100644 --- a/ceresdb-grpc/pom.xml +++ b/ceresdb-grpc/pom.xml @@ -4,7 +4,7 @@ ceresdb-client io.ceresdb - 0.1.0-RC + ${revision} ceresdb-grpc diff --git a/ceresdb-http/pom.xml b/ceresdb-http/pom.xml index 90ac69f..34c6441 100644 --- a/ceresdb-http/pom.xml +++ b/ceresdb-http/pom.xml @@ -4,7 +4,7 @@ ceresdb-client io.ceresdb - 0.1.0-RC + ${revision} ceresdb-http diff --git a/ceresdb-protocol/pom.xml b/ceresdb-protocol/pom.xml index d25b6c3..899cc65 100644 --- a/ceresdb-protocol/pom.xml +++ b/ceresdb-protocol/pom.xml @@ -4,7 +4,7 @@ ceresdb-client io.ceresdb - 0.1.0-RC + ${revision} ceresdb-protocol diff --git a/ceresdb-rpc/pom.xml b/ceresdb-rpc/pom.xml index 3e69d61..8518468 100644 --- a/ceresdb-rpc/pom.xml +++ b/ceresdb-rpc/pom.xml @@ -4,7 +4,7 @@ ceresdb-client io.ceresdb - 0.1.0-RC + ${revision} ceresdb-rpc diff --git a/ceresdb-sql-javacc/pom.xml b/ceresdb-sql-javacc/pom.xml index b5bfd4c..791f6b4 100644 --- a/ceresdb-sql-javacc/pom.xml +++ b/ceresdb-sql-javacc/pom.xml @@ -4,7 +4,7 @@ ceresdb-client io.ceresdb - 0.1.0-RC + ${revision} ceresdb-sql-javacc diff --git a/ceresdb-sql/pom.xml b/ceresdb-sql/pom.xml index 2d7c48d..c48f278 100644 --- a/ceresdb-sql/pom.xml +++ b/ceresdb-sql/pom.xml @@ -4,7 +4,7 @@ ceresdb-client io.ceresdb - 0.1.0-RC + ${revision} ceresdb-sql diff --git a/pom.xml b/pom.xml index 3e151d5..391d37a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ io.ceresdb ceresdb-client - 0.1.0-RC + ${revision} pom ceresdb-client - CeresDBClient is a high-performance Java client for CeresDB. CeresDB is a high-performance, distributed, schema-less, cloud native time-series database that can handle both time-series and analytics workloads. - https://github.com/CeresDB/ceresdb-client-java + Official Java client implementation for CeresDB. + https://github.com/CeresDB @@ -21,12 +21,8 @@ - zuliang.wzl - zuliangwanghust@gmail.com - - - weirong.cwr - weirong.cwr@gmail.com + ceresdb team + ceresdbservice@gmail.com @@ -60,6 +56,7 @@ + 1.10.2 2.8.9 1.23.0 @@ -78,6 +75,8 @@ 2.8.0 UTF-8 3.21.7 + + 0.1.0 1.7.21 @@ -456,5 +455,4 @@ - From a6098087479464df7d64373a3b5b0cae8fcd6a2e Mon Sep 17 00:00:00 2001 From: Arthur Chern Date: Wed, 11 Jan 2023 11:59:10 +0800 Subject: [PATCH 2/3] feat: add flatten-maven-plugin --- pom.xml | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 391d37a..7c1f84b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 io.ceresdb @@ -452,6 +453,31 @@ -Xdoclint:none + + org.codehaus.mojo + flatten-maven-plugin + 1.1.0 + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + From 7cf0d34c961f60417aa92fd1d6f38b2939d9698d Mon Sep 17 00:00:00 2001 From: Arthur Chern Date: Wed, 11 Jan 2023 12:05:04 +0800 Subject: [PATCH 3/3] chore: refine gitignore --- .gitignore | 10 +++------- pom.xml | 1 - 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index f6f86ec..695e5a1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,12 +4,6 @@ # Log file *.log -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - # Package Files # *.jar *.war @@ -30,6 +24,8 @@ target .classpath .project .settings +**/.flattened-pom.xml +**/.flattened-pom.xml.bak # IDEA files -*.iml \ No newline at end of file +*.iml diff --git a/pom.xml b/pom.xml index 7c1f84b..c402c3c 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,6 @@ - 1.10.2 2.8.9 1.23.0