This is an automated email from the ASF dual-hosted git repository. coolfrog pushed a commit to branch fix_heap_mem in repository https://gitbox.apache.org/repos/asf/incubator-horaedb-client-java.git
commit 51d444b906aa285caf6f7a60c7717bed0c6cd5c6 Author: CooooolFrog <[email protected]> AuthorDate: Wed Apr 17 14:01:10 2024 +0800 update grpc --- .DS_Store | Bin 0 -> 6148 bytes pom.xml => .flattened-pom.xml | 211 ++++----- .flattened-pom.xml.bak | 470 +++++++++++++++++++++ ...db-incubating-java-client-v2.0.0-src.tar.gz.asc | 14 + ...incubating-java-client-v2.0.0-src.tar.gz.sha512 | 1 + 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-proto-internal/.flattened-pom.xml | 161 +++++++ ceresdb-proto-internal/.flattened-pom.xml.bak | 162 +++++++ ceresdb-protocol/pom.xml | 2 +- ceresdb-rpc/pom.xml | 2 +- ceresdb-sql-javacc/pom.xml | 2 +- ceresdb-sql/pom.xml | 2 +- .../pom.xml => horaedb-all/.flattened-pom.xml | 36 +- horaedb-all/.flattened-pom.xml.bak | 47 +++ .../pom.xml => horaedb-common/.flattened-pom.xml | 29 +- horaedb-common/.flattened-pom.xml.bak | 54 +++ .../pom.xml => horaedb-example/.flattened-pom.xml | 27 +- horaedb-example/.flattened-pom.xml.bak | 52 +++ .../pom.xml => horaedb-grpc/.flattened-pom.xml | 33 +- horaedb-grpc/.flattened-pom.xml.bak | 74 ++++ horaedb-protocol/.DS_Store | Bin 0 -> 6148 bytes .../pom.xml => horaedb-protocol/.flattened-pom.xml | 48 ++- horaedb-protocol/.flattened-pom.xml.bak | 81 ++++ horaedb-rpc/.flattened-pom.xml | 25 ++ horaedb-rpc/.flattened-pom.xml.bak | 26 ++ .../.flattened-pom.xml | 27 +- horaedb-sql-javacc/.flattened-pom.xml.bak | 63 +++ .../pom.xml => horaedb-sql/.flattened-pom.xml | 28 +- horaedb-sql/.flattened-pom.xml.bak | 44 ++ pom.xml | 31 +- 34 files changed, 1518 insertions(+), 244 deletions(-) diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..ede4f73 Binary files /dev/null and b/.DS_Store differ diff --git a/pom.xml b/.flattened-pom.xml similarity index 76% copy from pom.xml copy to .flattened-pom.xml index b6ba66e..3e212af 100644 --- a/pom.xml +++ b/.flattened-pom.xml @@ -1,16 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<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 https://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - - <groupId>io.ceresdb</groupId> - <artifactId>ceresdb-client</artifactId> - <version>0.1.0-RC</version> + <parent> + <artifactId>apache</artifactId> + <groupId>org.apache</groupId> + <version>31</version> + </parent> + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-client</artifactId> + <version>2.0.0</version> <packaging>pom</packaging> - - <name>ceresdb-client</name> - <description>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.</description> - <url>https://github.com/CeresDB/ceresdb-client-java</url> - + <name>horaedb-client</name> + <description>Official Java client implementation for horaeDB.</description> + <url>https://horaedb.apache.org</url> <licenses> <license> <name>The Apache Software License, Version 2.0</name> @@ -18,49 +20,28 @@ <distribution>repo,manual</distribution> </license> </licenses> - <developers> <developer> - <name>zuliang.wzl</name> - <email>[email protected]</email> - </developer> - <developer> - <name>weirong.cwr</name> - <email>[email protected]</email> + <name>horaedb team</name> </developer> </developers> - <modules> - <module>ceresdb-all</module> - <module>ceresdb-common</module> - <module>ceresdb-example</module> - <module>ceresdb-grpc</module> - <module>ceresdb-protocol</module> - <module>ceresdb-rpc</module> - <module>ceresdb-sql</module> - <module>ceresdb-sql-javacc</module> - <module>ceresdb-http</module> + <module>horaedb-all</module> + <module>horaedb-common</module> + <module>horaedb-example</module> + <module>horaedb-grpc</module> + <module>horaedb-protocol</module> + <module>horaedb-rpc</module> + <module>horaedb-sql</module> + <module>horaedb-sql-javacc</module> </modules> - <scm> - <connection>https://github.com/CeresDB/ceresdb-client-java</connection> - <developerConnection>https://github.com/CeresDB/ceresdb-client-java</developerConnection> - <url>https://github.com/CeresDB/ceresdb-client-java</url> + <connection>https://github.com/CeresDB/horaedb-client-java</connection> + <developerConnection>https://github.com/CeresDB/horaedb-client-java</developerConnection> + <url>https://github.com/CeresDB/horaedb-client-java</url> </scm> - - <distributionManagement> - <repository> - <id>ossrh</id> - <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url> - </repository> - <snapshotRepository> - <id>ossrh</id> - <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url> - </snapshotRepository> - </distributionManagement> - <properties> - <arvo.version>1.10.2</arvo.version> + <arrow.version>9.0.0</arrow.version> <gson.version>2.8.9</gson.version> <io.grpc.version>1.23.0</io.grpc.version> <jmh.version>1.20</jmh.version> @@ -77,66 +58,74 @@ <okhttp.version>4.9.1</okhttp.version> <okio.version>2.8.0</okio.version> <project.encoding>UTF-8</project.encoding> - <protobuf.version>3.21.5</protobuf.version> + <proto-internal.version>2.0.0</proto-internal.version> + <protobuf.version>3.25.1</protobuf.version> + <revision>2.0.0</revision> <slf4j.version>1.7.21</slf4j.version> + <zstd.version>1.5.2-5</zstd.version> </properties> - <dependencyManagement> <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-common</artifactId> + <artifactId>horaedb-common</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-grpc</artifactId> + <artifactId>horaedb-grpc</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-http</artifactId> + <artifactId>horaedb-protocol</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-protocol</artifactId> + <artifactId>horaedb-rpc</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-rpc</artifactId> + <artifactId>horaedb-sql</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-sql</artifactId> + <artifactId>horaedb-sql-javacc</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-sql-javacc</artifactId> + <artifactId>horaedb-example</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-example</artifactId> - <version>${project.version}</version> + <artifactId>horaedb-proto-internal</artifactId> + <version>${proto-internal.version}</version> </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4j.version}</version> </dependency> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> - <version>${arvo.version}</version> + <groupId>com.github.luben</groupId> + <artifactId>zstd-jni</artifactId> + <version>${zstd.version}</version> + </dependency> + <dependency> + <groupId>org.apache.arrow</groupId> + <artifactId>arrow-vector</artifactId> + <version>${arrow.version}</version> + </dependency> + <dependency> + <groupId>org.apache.arrow</groupId> + <artifactId>arrow-memory-unsafe</artifactId> + <version>${arrow.version}</version> </dependency> - - <!-- grpc --> <dependency> <groupId>io.grpc</groupId> <artifactId>grpc-netty-shaded</artifactId> @@ -157,15 +146,11 @@ <artifactId>gson</artifactId> <version>${gson.version}</version> </dependency> - - <!-- protobuf --> <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> <version>${protobuf.version}</version> </dependency> - - <!-- metrics --> <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-core</artifactId> @@ -177,8 +162,6 @@ </exclusion> </exclusions> </dependency> - - <!-- https://mvnrepository.com/artifact/com.netflix.concurrency-limits/concurrency-limits-core --> <dependency> <groupId>com.netflix.concurrency-limits</groupId> <artifactId>concurrency-limits-core</artifactId> @@ -190,8 +173,6 @@ </exclusion> </exclusions> </dependency> - - <!-- log impl --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> @@ -210,8 +191,6 @@ <version>${log4j.version}</version> <scope>provided</scope> </dependency> - - <!-- http client --> <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-stdlib-common</artifactId> @@ -246,8 +225,6 @@ </exclusion> </exclusions> </dependency> - - <!-- test --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -266,8 +243,6 @@ <version>${mockito.version}</version> <scope>test</scope> </dependency> - - <!-- benchmark --> <dependency> <groupId>org.openjdk.jmh</groupId> <artifactId>jmh-core</artifactId> @@ -282,11 +257,15 @@ </dependency> </dependencies> </dependencyManagement> - <build> + <resources> + <resource> + <filtering>true</filtering> + <directory>src/main/resources</directory> + </resource> + </resources> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>3.8.0</version> <configuration> @@ -297,7 +276,6 @@ <showWarnings>true</showWarnings> </configuration> </plugin> - <!-- formatter refer to: https://code.revelc.net/formatter-maven-plugin/examples.html --> <plugin> <groupId>net.revelc.code.formatter</groupId> <artifactId>formatter-maven-plugin</artifactId> @@ -323,10 +301,10 @@ <exclude>**/sql/SimpleCharStream.java</exclude> <exclude>**/sql/Token.java</exclude> <exclude>**/sql/TokenMgrException.java</exclude> + <exclude>**/ReadmeTest.java</exclude> </excludes> </configuration> </plugin> - <!-- sort pom --> <plugin> <groupId>com.github.ekryd.sortpom</groupId> <artifactId>sortpom-maven-plugin</artifactId> @@ -347,9 +325,7 @@ <encoding>${project.encoding}</encoding> </configuration> </plugin> - <!-- Source --> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <version>3.0.1</version> <executions> @@ -362,7 +338,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> <version>3.15.0</version> <executions> @@ -374,10 +349,8 @@ </executions> <configuration> <failOnViolation>true</failOnViolation> - <!-- this is actually true by default, but can be disabled --> <printFailingErrors>true</printFailingErrors> <analysisCache>true</analysisCache> - <!-- enable incremental analysis --> <analysisCacheLocation>${project.build.directory}/pmd/pmd.cache</analysisCacheLocation> <excludes> <exclude>**/ServiceLoader.java</exclude> @@ -414,6 +387,11 @@ <include>**/src/main/java/**</include> <include>**/src/test/java/**</include> </includes> + <excludes> + <exclude>**/sql/CeresDBSqlParser.java</exclude> + <exclude>**/sql/CeresDBSqlParserConstants.java</exclude> + <exclude>**/sql/CeresDBSqlParserTokenManager.java</exclude> + </excludes> <strictCheck>true</strictCheck> <mapping> <java>SLASHSTAR_STYLE</java> @@ -421,23 +399,10 @@ </configuration> </plugin> <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <serverId>ossrh</serverId> - <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl> - <autoReleaseAfterClose>true</autoReleaseAfterClose> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> <version>1.6</version> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>2.9.1</version> <executions> @@ -449,12 +414,56 @@ </execution> </executions> <configuration> - <!-- ignore javadoc check--> <additionalparam>-Xdoclint:none</additionalparam> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <version>1.1.0</version> + <executions> + <execution> + <id>flatten</id> + <phase>process-resources</phase> + <goals> + <goal>flatten</goal> + </goals> + </execution> + <execution> + <id>flatten.clean</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + <configuration> + <updatePomFile>true</updatePomFile> + <flattenMode>resolveCiFriendliesOnly</flattenMode> + </configuration> + </plugin> </plugins> </build> - - + <profiles> + <profile> + <id>deploy</id> + <build> + <plugins> + <plugin> + <artifactId>maven-gpg-plugin</artifactId> + <version>3.1.0</version> + <executions> + <execution> + <id>sign-artifacts</id> + <phase>verify</phase> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/.flattened-pom.xml.bak b/.flattened-pom.xml.bak new file mode 100644 index 0000000..69cb7e9 --- /dev/null +++ b/.flattened-pom.xml.bak @@ -0,0 +1,470 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>31</version> + </parent> + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-client</artifactId> + <version>2.0.0</version> + <packaging>pom</packaging> + <name>horaedb-client</name> + <description>Official Java client implementation for horaeDB.</description> + <url>https://horaedb.apache.org</url> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo,manual</distribution> + </license> + </licenses> + <developers> + <developer> + <name>horaedb team</name> + </developer> + </developers> + <modules> + <module>horaedb-all</module> + <module>horaedb-common</module> + <module>horaedb-example</module> + <module>horaedb-grpc</module> + <module>horaedb-protocol</module> + <module>horaedb-rpc</module> + <module>horaedb-sql</module> + <module>horaedb-sql-javacc</module> + </modules> + <scm> + <connection>https://github.com/CeresDB/horaedb-client-java</connection> + <developerConnection>https://github.com/CeresDB/horaedb-client-java</developerConnection> + <url>https://github.com/CeresDB/horaedb-client-java</url> + </scm> + <properties> + <kotlin.version>1.6.0</kotlin.version> + <okio.version>2.8.0</okio.version> + <zstd.version>1.5.2-5</zstd.version> + <gson.version>2.8.9</gson.version> + <mockito.version>1.9.5</mockito.version> + <okhttp.version>4.9.1</okhttp.version> + <revision>2.0.0</revision> + <maven.compiler.source>8</maven.compiler.source> + <junit.version>4.13.1</junit.version> + <main.user.dir>${user.dir}</main.user.dir> + <slf4j.version>1.7.21</slf4j.version> + <project.encoding>UTF-8</project.encoding> + <io.grpc.version>1.23.0</io.grpc.version> + <jmh.version>1.20</jmh.version> + <limits.version>0.3.6</limits.version> + <maven.compiler.target>8</maven.compiler.target> + <junit.dep.version>4.8.2</junit.dep.version> + <protobuf.version>3.25.1</protobuf.version> + <proto-internal.version>2.0.0</proto-internal.version> + <metrics.version>4.2.2</metrics.version> + <arrow.version>9.0.0</arrow.version> + <log4j.version>2.17.1</log4j.version> + </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-grpc</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-protocol</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-rpc</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-sql</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-sql-javacc</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-example</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-proto-internal</artifactId> + <version>${proto-internal.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> + <groupId>com.github.luben</groupId> + <artifactId>zstd-jni</artifactId> + <version>${zstd.version}</version> + </dependency> + <dependency> + <groupId>org.apache.arrow</groupId> + <artifactId>arrow-vector</artifactId> + <version>${arrow.version}</version> + </dependency> + <dependency> + <groupId>org.apache.arrow</groupId> + <artifactId>arrow-memory-unsafe</artifactId> + <version>${arrow.version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-netty-shaded</artifactId> + <version>${io.grpc.version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-protobuf</artifactId> + <version>${io.grpc.version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-stub</artifactId> + <version>${io.grpc.version}</version> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>${gson.version}</version> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>${protobuf.version}</version> + </dependency> + <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-core</artifactId> + <version>${metrics.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.netflix.concurrency-limits</groupId> + <artifactId>concurrency-limits-core</artifactId> + <version>${limits.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>${log4j.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib-common</artifactId> + <version>${kotlin.version}</version> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib</artifactId> + <version>${kotlin.version}</version> + </dependency> + <dependency> + <groupId>com.squareup.okio</groupId> + <artifactId>okio</artifactId> + <version>${okio.version}</version> + </dependency> + <dependency> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>okhttp</artifactId> + <version>${okhttp.version}</version> + <exclusions> + <exclusion> + <groupId>com.squareup.okio</groupId> + <artifactId>okio</artifactId> + </exclusion> + <exclusion> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib</artifactId> + </exclusion> + <exclusion> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib-common</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit-dep</artifactId> + <version>${junit.dep.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>${mockito.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.openjdk.jmh</groupId> + <artifactId>jmh-core</artifactId> + <version>${jmh.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.openjdk.jmh</groupId> + <artifactId>jmh-generator-annprocess</artifactId> + <version>${jmh.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + </dependencyManagement> + <build> + <resources> + <resource> + <filtering>true</filtering> + <directory>src/main/resources</directory> + </resource> + </resources> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.8.0</version> + <configuration> + <source>${maven.compiler.source}</source> + <target>${maven.compiler.target}</target> + <encoding>${project.encoding}</encoding> + <showDeprecation>true</showDeprecation> + <showWarnings>true</showWarnings> + </configuration> + </plugin> + <plugin> + <groupId>net.revelc.code.formatter</groupId> + <artifactId>formatter-maven-plugin</artifactId> + <version>2.15.0</version> + <executions> + <execution> + <goals> + <goal>format</goal> + <goal>validate</goal> + </goals> + </execution> + </executions> + <configuration> + <configFile>${main.user.dir}/tools/codestyle/formatter.xml</configFile> + <encoding>${project.encoding}</encoding> + <excludes> + <exclude>**/proto/*</exclude> + <exclude>**/sql/AbstractCharStream.java</exclude> + <exclude>**/sql/CeresDBSqlParser.java</exclude> + <exclude>**/sql/CeresDBSqlParserConstants.java</exclude> + <exclude>**/sql/CeresDBSqlParserTokenManager.java</exclude> + <exclude>**/sql/ParseException.java</exclude> + <exclude>**/sql/SimpleCharStream.java</exclude> + <exclude>**/sql/Token.java</exclude> + <exclude>**/sql/TokenMgrException.java</exclude> + <exclude>**/ReadmeTest.java</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <groupId>com.github.ekryd.sortpom</groupId> + <artifactId>sortpom-maven-plugin</artifactId> + <version>2.4.0</version> + <executions> + <execution> + <id>sort-pom</id> + <phase>compile</phase> + <goals> + <goal>sort</goal> + </goals> + </execution> + </executions> + <configuration> + <nrOfIndentSpace>4</nrOfIndentSpace> + <keepBlankLines>true</keepBlankLines> + <sortProperties>true</sortProperties> + <encoding>${project.encoding}</encoding> + </configuration> + </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <version>3.0.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + <version>3.15.0</version> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + <configuration> + <failOnViolation>true</failOnViolation> + <printFailingErrors>true</printFailingErrors> + <analysisCache>true</analysisCache> + <analysisCacheLocation>${project.build.directory}/pmd/pmd.cache</analysisCacheLocation> + <excludes> + <exclude>**/ServiceLoader.java</exclude> + <exclude>**/UnsafeUtil.java</exclude> + <exclude>**/proto/*</exclude> + <exclude>**/sql/AbstractCharStream.java</exclude> + <exclude>**/sql/CeresDBSqlParser.java</exclude> + <exclude>**/sql/CeresDBSqlParserConstants.java</exclude> + <exclude>**/sql/CeresDBSqlParserTokenManager.java</exclude> + <exclude>**/sql/ParseException.java</exclude> + <exclude>**/sql/SimpleCharStream.java</exclude> + <exclude>**/sql/Token.java</exclude> + <exclude>**/sql/TokenMgrException.java</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <groupId>com.mycila</groupId> + <artifactId>license-maven-plugin</artifactId> + <version>3.0</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>remove</goal> + <goal>format</goal> + </goals> + </execution> + </executions> + <configuration> + <quiet>true</quiet> + <header>${main.user.dir}/tools/codestyle/HEADER</header> + <includes> + <include>**/src/main/java/**</include> + <include>**/src/test/java/**</include> + </includes> + <excludes> + <exclude>**/sql/CeresDBSqlParser.java</exclude> + <exclude>**/sql/CeresDBSqlParserConstants.java</exclude> + <exclude>**/sql/CeresDBSqlParserTokenManager.java</exclude> + </excludes> + <strictCheck>true</strictCheck> + <mapping> + <java>SLASHSTAR_STYLE</java> + </mapping> + </configuration> + </plugin> + <plugin> + <artifactId>maven-gpg-plugin</artifactId> + <version>1.6</version> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.9.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + <configuration> + <additionalparam>-Xdoclint:none</additionalparam> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <version>1.1.0</version> + <executions> + <execution> + <id>flatten</id> + <phase>process-resources</phase> + <goals> + <goal>flatten</goal> + </goals> + </execution> + <execution> + <id>flatten.clean</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + <configuration> + <updatePomFile>true</updatePomFile> + <flattenMode>resolveCiFriendliesOnly</flattenMode> + </configuration> + </plugin> + </plugins> + </build> + <profiles> + <profile> + <id>deploy</id> + <build> + <plugins> + <plugin> + <artifactId>maven-gpg-plugin</artifactId> + <version>3.1.0</version> + <executions> + <execution> + <id>sign-artifacts</id> + <phase>verify</phase> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> diff --git a/apache-horaedb-incubating-java-client-v2.0.0-src.tar.gz.asc b/apache-horaedb-incubating-java-client-v2.0.0-src.tar.gz.asc new file mode 100644 index 0000000..67872aa --- /dev/null +++ b/apache-horaedb-incubating-java-client-v2.0.0-src.tar.gz.asc @@ -0,0 +1,14 @@ +-----BEGIN PGP SIGNATURE----- + +iQGzBAABCAAdFiEELYfAZsBXK70AxD26gYYQbcaHfSYFAmYKbr4ACgkQgYYQbcaH +fSZf5wv/TAq6O3AXoyLaw2NDtoD7gmZoifKY8UpNyAjljtWBMUyIEKgJBrr2UnZ1 +mqUk6W+iRdPk0RY73hTaDtTJys22BWm/WkTXEXanVUv+yJ4O+pDifmAOJDPr4fpC +KrnHXShX0KAFG/63ARle3gOZqXYLkHBSZ2HucDQFvvDbbKDHoN3btoq11Y+z28YB +p3EwiK4xWzqdz9OeNqwjHoObwZ0/TzmYsmxMmu0UC4XeSFkrrHeglDb41FzlEGL9 +Xlve+pMO0mothi2UygNsKzdOBkUT7oZIroe1m+leFcKZ9RYLCSx4T9NyI9V5RsZo +Xy4KTb3hLmp4h4fbQrR+PzKHH/QTT3pqZLE9zOES9g/0RhMSlPcbpSOglLerN6fm +mBHokUwUoEwaVv522WqxnJl+W2UShhZjWQGg74R2zGz3ZZh1TfO0DjZ1baR3++sA +kJ5wxJuHUlsEzmWLAdBiDqbQ0YdM6Jyqi2U9wtXWTA9PQ6dMW7KL2AoSnFXFQTWW +JYPrf3lD +=5L5a +-----END PGP SIGNATURE----- diff --git a/apache-horaedb-incubating-java-client-v2.0.0-src.tar.gz.sha512 b/apache-horaedb-incubating-java-client-v2.0.0-src.tar.gz.sha512 new file mode 100644 index 0000000..24ef275 --- /dev/null +++ b/apache-horaedb-incubating-java-client-v2.0.0-src.tar.gz.sha512 @@ -0,0 +1 @@ +89c9ed9c6c29ccca0b5329861bbd78a71710637a9d43b59f1153ec77e32c7f19086c86140adae1adcbb2e8f12e0a5dfd01609891569ec94c8fc46dfef7f68a60 apache-horaedb-incubating-java-client-v2.0.0-src.tar.gz diff --git a/ceresdb-all/pom.xml b/ceresdb-all/pom.xml index 6626045..a18c962 100644 --- a/ceresdb-all/pom.xml +++ b/ceresdb-all/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>ceresdb-client</artifactId> <groupId>io.ceresdb</groupId> - <version>0.1.0-RC</version> + <version>0.1.0-FIX</version> </parent> <artifactId>ceresdb-all</artifactId> diff --git a/ceresdb-common/pom.xml b/ceresdb-common/pom.xml index f61b3f4..0fdf0f1 100644 --- a/ceresdb-common/pom.xml +++ b/ceresdb-common/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>ceresdb-client</artifactId> <groupId>io.ceresdb</groupId> - <version>0.1.0-RC</version> + <version>0.1.0-FIX</version> </parent> <artifactId>ceresdb-common</artifactId> diff --git a/ceresdb-example/pom.xml b/ceresdb-example/pom.xml index d849b8b..b95debc 100644 --- a/ceresdb-example/pom.xml +++ b/ceresdb-example/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>ceresdb-client</artifactId> <groupId>io.ceresdb</groupId> - <version>0.1.0-RC</version> + <version>0.1.0-FIX</version> </parent> <artifactId>ceresdb-example</artifactId> diff --git a/ceresdb-grpc/pom.xml b/ceresdb-grpc/pom.xml index 55f6c8b..26b0364 100644 --- a/ceresdb-grpc/pom.xml +++ b/ceresdb-grpc/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>ceresdb-client</artifactId> <groupId>io.ceresdb</groupId> - <version>0.1.0-RC</version> + <version>0.1.0-FIX</version> </parent> <artifactId>ceresdb-grpc</artifactId> diff --git a/ceresdb-http/pom.xml b/ceresdb-http/pom.xml index 90ac69f..5b1f246 100644 --- a/ceresdb-http/pom.xml +++ b/ceresdb-http/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>ceresdb-client</artifactId> <groupId>io.ceresdb</groupId> - <version>0.1.0-RC</version> + <version>0.1.0-FIX</version> </parent> <artifactId>ceresdb-http</artifactId> diff --git a/ceresdb-proto-internal/.flattened-pom.xml b/ceresdb-proto-internal/.flattened-pom.xml new file mode 100644 index 0000000..4d0d754 --- /dev/null +++ b/ceresdb-proto-internal/.flattened-pom.xml @@ -0,0 +1,161 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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 https://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>ceresdb-client</artifactId> + <groupId>io.ceresdb</groupId> + <version>0.2.0-alpha3</version> + </parent> + <groupId>io.ceresdb</groupId> + <artifactId>ceresdb-proto-internal</artifactId> + <version>0.2.0-alpha3</version> + <description>This is a project that manages Java code generated by GRPC tool set</description> + <url>https://github.com/CeresDB/ceresdbproto</url> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo,manual</distribution> + </license> + </licenses> + <developers> + <developer> + <name>ceresdb team</name> + <email>[email protected]</email> + </developer> + </developers> + <distributionManagement> + <repository> + <id>central_dev</id> + <name>alipay dev Repository</name> + <url>http://mvn.dev.alipay.net/artifactory/content/repositories/Alipay-Releases</url> + </repository> + </distributionManagement> + <properties> + <io.grpc.version>1.33.0</io.grpc.version> + <junit.version>4.13.1</junit.version> + <maven.compiler.source>8</maven.compiler.source> + <maven.compiler.target>8</maven.compiler.target> + <maven.deploy.skip>false</maven.deploy.skip> + <project.encoding>UTF-8</project.encoding> + <protobuf.version>3.21.5</protobuf.version> + </properties> + <dependencies> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-protobuf</artifactId> + <version>${io.grpc.version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-stub</artifactId> + <version>${io.grpc.version}</version> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>${protobuf.version}</version> + </dependency> + </dependencies> + <build> + <extensions> + <extension> + <groupId>kr.motd.maven</groupId> + <artifactId>os-maven-plugin</artifactId> + <version>1.4.1.Final</version> + </extension> + </extensions> + <finalName>ceresdb-proto-internal</finalName> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.8.0</version> + <configuration> + <source>${maven.compiler.source}</source> + <target>${maven.compiler.target}</target> + <encoding>${project.encoding}</encoding> + <showDeprecation>true</showDeprecation> + <showWarnings>true</showWarnings> + </configuration> + </plugin> + <plugin> + <groupId>com.github.ekryd.sortpom</groupId> + <artifactId>sortpom-maven-plugin</artifactId> + <version>2.4.0</version> + <executions> + <execution> + <id>sort-pom</id> + <phase>compile</phase> + <goals> + <goal>sort</goal> + </goals> + </execution> + </executions> + <configuration> + <nrOfIndentSpace>4</nrOfIndentSpace> + <keepBlankLines>true</keepBlankLines> + <sortProperties>true</sortProperties> + <encoding>${project.encoding}</encoding> + </configuration> + </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <version>3.0.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.xolstice.maven.plugins</groupId> + <artifactId>protobuf-maven-plugin</artifactId> + <version>0.5.1</version> + <executions> + <execution> + <goals> + <goal>compile</goal> + <goal>compile-custom</goal> + </goals> + </execution> + </executions> + <configuration> + <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact> + <pluginId>grpc-java</pluginId> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> + <protoSourceRoot>${project.basedir}/protos</protoSourceRoot> + <outputDirectory>${project.basedir}/src/main/java</outputDirectory> + <clearOutputDirectory>false</clearOutputDirectory> + <temporaryProtoFileDirectory>${project.build.directory}/protoc-dependencies</temporaryProtoFileDirectory> + <includes> + <include>storage.proto</include> + <include>common.proto</include> + <include>prometheus.proto</include> + </includes> + </configuration> + </plugin> + <plugin> + <artifactId>maven-gpg-plugin</artifactId> + <version>1.6</version> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.9.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + <configuration> + <additionalparam>-Xdoclint:none</additionalparam> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/ceresdb-proto-internal/.flattened-pom.xml.bak b/ceresdb-proto-internal/.flattened-pom.xml.bak new file mode 100644 index 0000000..b8a1ced --- /dev/null +++ b/ceresdb-proto-internal/.flattened-pom.xml.bak @@ -0,0 +1,162 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>io.ceresdb</groupId> + <artifactId>ceresdb-client</artifactId> + <version>0.2.0-alpha3</version> + </parent> + <groupId>io.ceresdb</groupId> + <artifactId>ceresdb-proto-internal</artifactId> + <version>0.2.0-alpha3</version> + <description>This is a project that manages Java code generated by GRPC tool set</description> + <url>https://github.com/CeresDB/ceresdbproto</url> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo,manual</distribution> + </license> + </licenses> + <developers> + <developer> + <name>ceresdb team</name> + <email>[email protected]</email> + </developer> + </developers> + <distributionManagement> + <repository> + <id>central_dev</id> + <name>alipay dev Repository</name> + <url>http://mvn.dev.alipay.net/artifactory/content/repositories/Alipay-Releases</url> + </repository> + </distributionManagement> + <properties> + <protobuf.version>3.21.5</protobuf.version> + <maven.compiler.source>8</maven.compiler.source> + <maven.deploy.skip>false</maven.deploy.skip> + <maven.compiler.target>8</maven.compiler.target> + <io.grpc.version>1.33.0</io.grpc.version> + <project.encoding>UTF-8</project.encoding> + <junit.version>4.13.1</junit.version> + </properties> + <dependencies> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-protobuf</artifactId> + <version>${io.grpc.version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-stub</artifactId> + <version>${io.grpc.version}</version> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>${protobuf.version}</version> + </dependency> + </dependencies> + <build> + <extensions> + <extension> + <groupId>kr.motd.maven</groupId> + <artifactId>os-maven-plugin</artifactId> + <version>1.4.1.Final</version> + </extension> + </extensions> + <finalName>ceresdb-proto-internal</finalName> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.8.0</version> + <configuration> + <source>${maven.compiler.source}</source> + <target>${maven.compiler.target}</target> + <encoding>${project.encoding}</encoding> + <showDeprecation>true</showDeprecation> + <showWarnings>true</showWarnings> + </configuration> + </plugin> + <plugin> + <groupId>com.github.ekryd.sortpom</groupId> + <artifactId>sortpom-maven-plugin</artifactId> + <version>2.4.0</version> + <executions> + <execution> + <id>sort-pom</id> + <phase>compile</phase> + <goals> + <goal>sort</goal> + </goals> + </execution> + </executions> + <configuration> + <nrOfIndentSpace>4</nrOfIndentSpace> + <keepBlankLines>true</keepBlankLines> + <sortProperties>true</sortProperties> + <encoding>${project.encoding}</encoding> + </configuration> + </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <version>3.0.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.xolstice.maven.plugins</groupId> + <artifactId>protobuf-maven-plugin</artifactId> + <version>0.5.1</version> + <executions> + <execution> + <goals> + <goal>compile</goal> + <goal>compile-custom</goal> + </goals> + </execution> + </executions> + <configuration> + <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact> + <pluginId>grpc-java</pluginId> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier}</pluginArtifact> + <protoSourceRoot>${project.basedir}/protos</protoSourceRoot> + <outputDirectory>${project.basedir}/src/main/java</outputDirectory> + <clearOutputDirectory>false</clearOutputDirectory> + <temporaryProtoFileDirectory>${project.build.directory}/protoc-dependencies</temporaryProtoFileDirectory> + <includes> + <include>storage.proto</include> + <include>common.proto</include> + <include>prometheus.proto</include> + </includes> + </configuration> + </plugin> + <plugin> + <artifactId>maven-gpg-plugin</artifactId> + <version>1.6</version> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.9.1</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + <configuration> + <additionalparam>-Xdoclint:none</additionalparam> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/ceresdb-protocol/pom.xml b/ceresdb-protocol/pom.xml index d25b6c3..2e1e20f 100644 --- a/ceresdb-protocol/pom.xml +++ b/ceresdb-protocol/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>ceresdb-client</artifactId> <groupId>io.ceresdb</groupId> - <version>0.1.0-RC</version> + <version>0.1.0-FIX</version> </parent> <artifactId>ceresdb-protocol</artifactId> diff --git a/ceresdb-rpc/pom.xml b/ceresdb-rpc/pom.xml index 3e69d61..844db86 100644 --- a/ceresdb-rpc/pom.xml +++ b/ceresdb-rpc/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>ceresdb-client</artifactId> <groupId>io.ceresdb</groupId> - <version>0.1.0-RC</version> + <version>0.1.0-FIX</version> </parent> <artifactId>ceresdb-rpc</artifactId> diff --git a/ceresdb-sql-javacc/pom.xml b/ceresdb-sql-javacc/pom.xml index b5bfd4c..3462248 100644 --- a/ceresdb-sql-javacc/pom.xml +++ b/ceresdb-sql-javacc/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>ceresdb-client</artifactId> <groupId>io.ceresdb</groupId> - <version>0.1.0-RC</version> + <version>0.1.0-FIX</version> </parent> <artifactId>ceresdb-sql-javacc</artifactId> diff --git a/ceresdb-sql/pom.xml b/ceresdb-sql/pom.xml index 2d7c48d..6d7170a 100644 --- a/ceresdb-sql/pom.xml +++ b/ceresdb-sql/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>ceresdb-client</artifactId> <groupId>io.ceresdb</groupId> - <version>0.1.0-RC</version> + <version>0.1.0-FIX</version> </parent> <artifactId>ceresdb-sql</artifactId> diff --git a/ceresdb-all/pom.xml b/horaedb-all/.flattened-pom.xml similarity index 54% copy from ceresdb-all/pom.xml copy to horaedb-all/.flattened-pom.xml index 6626045..95eeecf 100644 --- a/ceresdb-all/pom.xml +++ b/horaedb-all/.flattened-pom.xml @@ -1,43 +1,45 @@ <?xml version="1.0" encoding="UTF-8"?> -<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 https://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>ceresdb-client</artifactId> - <groupId>io.ceresdb</groupId> - <version>0.1.0-RC</version> + <artifactId>horaedb-client</artifactId> + <groupId>org.apache.horaedb</groupId> + <version>2.0.0</version> </parent> - - <artifactId>ceresdb-all</artifactId> - + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-all</artifactId> + <version>2.0.0</version> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo,manual</distribution> + </license> + </licenses> <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-common</artifactId> + <artifactId>horaedb-common</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-grpc</artifactId> + <artifactId>horaedb-grpc</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-http</artifactId> + <artifactId>horaedb-protocol</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-protocol</artifactId> + <artifactId>horaedb-rpc</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-rpc</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-sql-javacc</artifactId> + <artifactId>horaedb-sql-javacc</artifactId> <version>${project.version}</version> </dependency> </dependencies> diff --git a/horaedb-all/.flattened-pom.xml.bak b/horaedb-all/.flattened-pom.xml.bak new file mode 100644 index 0000000..0132d84 --- /dev/null +++ b/horaedb-all/.flattened-pom.xml.bak @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-client</artifactId> + <version>2.0.0</version> + </parent> + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-all</artifactId> + <version>2.0.0</version> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo,manual</distribution> + </license> + </licenses> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-grpc</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-protocol</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-rpc</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-sql-javacc</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> +</project> diff --git a/ceresdb-common/pom.xml b/horaedb-common/.flattened-pom.xml similarity index 70% copy from ceresdb-common/pom.xml copy to horaedb-common/.flattened-pom.xml index f61b3f4..f7e8d44 100644 --- a/ceresdb-common/pom.xml +++ b/horaedb-common/.flattened-pom.xml @@ -1,33 +1,34 @@ <?xml version="1.0" encoding="UTF-8"?> -<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 https://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>ceresdb-client</artifactId> - <groupId>io.ceresdb</groupId> - <version>0.1.0-RC</version> + <artifactId>horaedb-client</artifactId> + <groupId>org.apache.horaedb</groupId> + <version>2.0.0</version> </parent> - - <artifactId>ceresdb-common</artifactId> - + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-common</artifactId> + <version>2.0.0</version> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo,manual</distribution> + </license> + </licenses> <dependencies> - <!-- metrics --> <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-core</artifactId> </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> - - <!-- protobuf --> <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> </dependency> - - <!-- test --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -38,8 +39,6 @@ <artifactId>junit-dep</artifactId> <scope>test</scope> </dependency> - - <!-- benchmark --> <dependency> <groupId>org.openjdk.jmh</groupId> <artifactId>jmh-core</artifactId> diff --git a/horaedb-common/.flattened-pom.xml.bak b/horaedb-common/.flattened-pom.xml.bak new file mode 100644 index 0000000..a1d2eed --- /dev/null +++ b/horaedb-common/.flattened-pom.xml.bak @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-client</artifactId> + <version>2.0.0</version> + </parent> + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-common</artifactId> + <version>2.0.0</version> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo,manual</distribution> + </license> + </licenses> + <dependencies> + <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-core</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit-dep</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.openjdk.jmh</groupId> + <artifactId>jmh-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.openjdk.jmh</groupId> + <artifactId>jmh-generator-annprocess</artifactId> + <scope>test</scope> + </dependency> + </dependencies> +</project> diff --git a/ceresdb-example/pom.xml b/horaedb-example/.flattened-pom.xml similarity index 67% copy from ceresdb-example/pom.xml copy to horaedb-example/.flattened-pom.xml index d849b8b..e0b0fc4 100644 --- a/ceresdb-example/pom.xml +++ b/horaedb-example/.flattened-pom.xml @@ -1,23 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> -<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 https://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>ceresdb-client</artifactId> - <groupId>io.ceresdb</groupId> - <version>0.1.0-RC</version> + <artifactId>horaedb-client</artifactId> + <groupId>org.apache.horaedb</groupId> + <version>2.0.0</version> </parent> - - <artifactId>ceresdb-example</artifactId> - + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-example</artifactId> + <version>2.0.0</version> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo,manual</distribution> + </license> + </licenses> <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-all</artifactId> + <artifactId>horaedb-all</artifactId> <version>${project.version}</version> </dependency> - - <!-- test --> - <!-- log impl --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> @@ -33,7 +37,6 @@ <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> diff --git a/horaedb-example/.flattened-pom.xml.bak b/horaedb-example/.flattened-pom.xml.bak new file mode 100644 index 0000000..d0cfdee --- /dev/null +++ b/horaedb-example/.flattened-pom.xml.bak @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-client</artifactId> + <version>2.0.0</version> + </parent> + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-example</artifactId> + <version>2.0.0</version> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo,manual</distribution> + </license> + </licenses> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-all</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit-dep</artifactId> + <scope>test</scope> + </dependency> + </dependencies> +</project> diff --git a/ceresdb-grpc/pom.xml b/horaedb-grpc/.flattened-pom.xml similarity index 76% copy from ceresdb-grpc/pom.xml copy to horaedb-grpc/.flattened-pom.xml index 55f6c8b..fe44b41 100644 --- a/ceresdb-grpc/pom.xml +++ b/horaedb-grpc/.flattened-pom.xml @@ -1,30 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> -<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 https://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>ceresdb-client</artifactId> - <groupId>io.ceresdb</groupId> - <version>0.1.0-RC</version> + <artifactId>horaedb-client</artifactId> + <groupId>org.apache.horaedb</groupId> + <version>2.0.0</version> </parent> - - <artifactId>ceresdb-grpc</artifactId> - + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-grpc</artifactId> + <version>2.0.0</version> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo,manual</distribution> + </license> + </licenses> <properties> <concurrency.limits.version>0.3.6</concurrency.limits.version> </properties> - <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-rpc</artifactId> + <artifactId>horaedb-rpc</artifactId> </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> - - <!-- grpc --> <dependency> <groupId>io.grpc</groupId> <artifactId>grpc-netty-shaded</artifactId> @@ -37,14 +40,10 @@ <groupId>io.grpc</groupId> <artifactId>grpc-stub</artifactId> </dependency> - <dependency> <groupId>com.netflix.concurrency-limits</groupId> <artifactId>concurrency-limits-core</artifactId> </dependency> - - <!-- test --> - <!-- log impl --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> @@ -60,8 +59,6 @@ <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> - - <!-- test --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> diff --git a/horaedb-grpc/.flattened-pom.xml.bak b/horaedb-grpc/.flattened-pom.xml.bak new file mode 100644 index 0000000..00bb238 --- /dev/null +++ b/horaedb-grpc/.flattened-pom.xml.bak @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-client</artifactId> + <version>2.0.0</version> + </parent> + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-grpc</artifactId> + <version>2.0.0</version> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo,manual</distribution> + </license> + </licenses> + <properties> + <concurrency.limits.version>0.3.6</concurrency.limits.version> + </properties> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-rpc</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-netty-shaded</artifactId> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-protobuf</artifactId> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-stub</artifactId> + </dependency> + <dependency> + <groupId>com.netflix.concurrency-limits</groupId> + <artifactId>concurrency-limits-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit-dep</artifactId> + <scope>test</scope> + </dependency> + </dependencies> +</project> diff --git a/horaedb-protocol/.DS_Store b/horaedb-protocol/.DS_Store new file mode 100644 index 0000000..3a13a39 Binary files /dev/null and b/horaedb-protocol/.DS_Store differ diff --git a/ceresdb-protocol/pom.xml b/horaedb-protocol/.flattened-pom.xml similarity index 58% copy from ceresdb-protocol/pom.xml copy to horaedb-protocol/.flattened-pom.xml index d25b6c3..ec05c3a 100644 --- a/ceresdb-protocol/pom.xml +++ b/horaedb-protocol/.flattened-pom.xml @@ -1,38 +1,51 @@ <?xml version="1.0" encoding="UTF-8"?> -<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 https://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>ceresdb-client</artifactId> - <groupId>io.ceresdb</groupId> - <version>0.1.0-RC</version> + <artifactId>horaedb-client</artifactId> + <groupId>org.apache.horaedb</groupId> + <version>2.0.0</version> </parent> - - <artifactId>ceresdb-protocol</artifactId> - + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-protocol</artifactId> + <version>2.0.0</version> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo,manual</distribution> + </license> + </licenses> <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-rpc</artifactId> + <artifactId>horaedb-rpc</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-proto-internal</artifactId> </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> + <groupId>com.github.luben</groupId> + <artifactId>zstd-jni</artifactId> + </dependency> + <dependency> + <groupId>org.apache.arrow</groupId> + <artifactId>arrow-vector</artifactId> + </dependency> + <dependency> + <groupId>org.apache.arrow</groupId> + <artifactId>arrow-memory-unsafe</artifactId> </dependency> - - <!-- test --> - <!-- rpc test --> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-grpc</artifactId> + <artifactId>horaedb-grpc</artifactId> <scope>test</scope> </dependency> - <!-- log impl --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> @@ -48,7 +61,6 @@ <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> diff --git a/horaedb-protocol/.flattened-pom.xml.bak b/horaedb-protocol/.flattened-pom.xml.bak new file mode 100644 index 0000000..1f7372d --- /dev/null +++ b/horaedb-protocol/.flattened-pom.xml.bak @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-client</artifactId> + <version>2.0.0</version> + </parent> + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-protocol</artifactId> + <version>2.0.0</version> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo,manual</distribution> + </license> + </licenses> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-rpc</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-proto-internal</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>com.github.luben</groupId> + <artifactId>zstd-jni</artifactId> + </dependency> + <dependency> + <groupId>org.apache.arrow</groupId> + <artifactId>arrow-vector</artifactId> + </dependency> + <dependency> + <groupId>org.apache.arrow</groupId> + <artifactId>arrow-memory-unsafe</artifactId> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-grpc</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit-dep</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> + </dependency> + </dependencies> +</project> diff --git a/horaedb-rpc/.flattened-pom.xml b/horaedb-rpc/.flattened-pom.xml new file mode 100644 index 0000000..fb55e5d --- /dev/null +++ b/horaedb-rpc/.flattened-pom.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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 https://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>horaedb-client</artifactId> + <groupId>org.apache.horaedb</groupId> + <version>2.0.0</version> + </parent> + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-rpc</artifactId> + <version>2.0.0</version> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo,manual</distribution> + </license> + </licenses> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-common</artifactId> + </dependency> + </dependencies> +</project> diff --git a/horaedb-rpc/.flattened-pom.xml.bak b/horaedb-rpc/.flattened-pom.xml.bak new file mode 100644 index 0000000..c1c6c2a --- /dev/null +++ b/horaedb-rpc/.flattened-pom.xml.bak @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-client</artifactId> + <version>2.0.0</version> + </parent> + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-rpc</artifactId> + <version>2.0.0</version> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo,manual</distribution> + </license> + </licenses> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-common</artifactId> + </dependency> + </dependencies> +</project> diff --git a/ceresdb-sql-javacc/pom.xml b/horaedb-sql-javacc/.flattened-pom.xml similarity index 73% copy from ceresdb-sql-javacc/pom.xml copy to horaedb-sql-javacc/.flattened-pom.xml index b5bfd4c..8cbaaa0 100644 --- a/ceresdb-sql-javacc/pom.xml +++ b/horaedb-sql-javacc/.flattened-pom.xml @@ -1,26 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> -<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 https://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>ceresdb-client</artifactId> - <groupId>io.ceresdb</groupId> - <version>0.1.0-RC</version> + <artifactId>horaedb-client</artifactId> + <groupId>org.apache.horaedb</groupId> + <version>2.0.0</version> </parent> - - <artifactId>ceresdb-sql-javacc</artifactId> - + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-sql-javacc</artifactId> + <version>2.0.0</version> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo,manual</distribution> + </license> + </licenses> <properties> <javacc-plugin.version>4.1.4</javacc-plugin.version> <jdk.version>1.8</jdk.version> </properties> - <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-protocol</artifactId> + <artifactId>horaedb-protocol</artifactId> </dependency> - - <!-- test --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -32,7 +36,6 @@ <scope>test</scope> </dependency> </dependencies> - <build> <plugins> <plugin> diff --git a/horaedb-sql-javacc/.flattened-pom.xml.bak b/horaedb-sql-javacc/.flattened-pom.xml.bak new file mode 100644 index 0000000..c7d5923 --- /dev/null +++ b/horaedb-sql-javacc/.flattened-pom.xml.bak @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-client</artifactId> + <version>2.0.0</version> + </parent> + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-sql-javacc</artifactId> + <version>2.0.0</version> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo,manual</distribution> + </license> + </licenses> + <properties> + <jdk.version>1.8</jdk.version> + <javacc-plugin.version>4.1.4</javacc-plugin.version> + </properties> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-protocol</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit-dep</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>com.helger.maven</groupId> + <artifactId>ph-javacc-maven-plugin</artifactId> + <version>${javacc-plugin.version}</version> + <executions> + <execution> + <id>jjc</id> + <phase>generate-sources</phase> + <goals> + <goal>javacc</goal> + </goals> + <configuration> + <jdkVersion>${jdk.version}</jdkVersion> + <sourceDirectory>src/main/javacc</sourceDirectory> + <outputDirectory>src/main/java</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> diff --git a/ceresdb-sql/pom.xml b/horaedb-sql/.flattened-pom.xml similarity index 60% copy from ceresdb-sql/pom.xml copy to horaedb-sql/.flattened-pom.xml index 2d7c48d..726714a 100644 --- a/ceresdb-sql/pom.xml +++ b/horaedb-sql/.flattened-pom.xml @@ -1,32 +1,34 @@ <?xml version="1.0" encoding="UTF-8"?> -<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 https://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>ceresdb-client</artifactId> - <groupId>io.ceresdb</groupId> - <version>0.1.0-RC</version> + <artifactId>horaedb-client</artifactId> + <groupId>org.apache.horaedb</groupId> + <version>2.0.0</version> </parent> - - <artifactId>ceresdb-sql</artifactId> - + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-sql</artifactId> + <version>2.0.0</version> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo,manual</distribution> + </license> + </licenses> <properties> <jsqlparser.version>4.0</jsqlparser.version> </properties> - <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>ceresdb-protocol</artifactId> + <artifactId>horaedb-protocol</artifactId> </dependency> - - <!-- sql parser --> <dependency> <groupId>com.github.jsqlparser</groupId> <artifactId>jsqlparser</artifactId> <version>${jsqlparser.version}</version> </dependency> - - <!-- test --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> diff --git a/horaedb-sql/.flattened-pom.xml.bak b/horaedb-sql/.flattened-pom.xml.bak new file mode 100644 index 0000000..1f6a60d --- /dev/null +++ b/horaedb-sql/.flattened-pom.xml.bak @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-client</artifactId> + <version>2.0.0</version> + </parent> + <groupId>org.apache.horaedb</groupId> + <artifactId>horaedb-sql</artifactId> + <version>2.0.0</version> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo,manual</distribution> + </license> + </licenses> + <properties> + <jsqlparser.version>4.0</jsqlparser.version> + </properties> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>horaedb-protocol</artifactId> + </dependency> + <dependency> + <groupId>com.github.jsqlparser</groupId> + <artifactId>jsqlparser</artifactId> + <version>${jsqlparser.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit-dep</artifactId> + <scope>test</scope> + </dependency> + </dependencies> +</project> diff --git a/pom.xml b/pom.xml index b6ba66e..cb0d497 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <groupId>io.ceresdb</groupId> <artifactId>ceresdb-client</artifactId> - <version>0.1.0-RC</version> + <version>0.1.0-FIX</version> <packaging>pom</packaging> <name>ceresdb-client</name> @@ -48,21 +48,10 @@ <url>https://github.com/CeresDB/ceresdb-client-java</url> </scm> - <distributionManagement> - <repository> - <id>ossrh</id> - <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url> - </repository> - <snapshotRepository> - <id>ossrh</id> - <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url> - </snapshotRepository> - </distributionManagement> - <properties> <arvo.version>1.10.2</arvo.version> <gson.version>2.8.9</gson.version> - <io.grpc.version>1.23.0</io.grpc.version> + <io.grpc.version>1.53.0</io.grpc.version> <jmh.version>1.20</jmh.version> <junit.dep.version>4.8.2</junit.dep.version> <junit.version>4.13.1</junit.version> @@ -420,22 +409,6 @@ </mapping> </configuration> </plugin> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <serverId>ossrh</serverId> - <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl> - <autoReleaseAfterClose>true</autoReleaseAfterClose> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <version>1.6</version> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
