This is an automated email from the ASF dual-hosted git repository.
coolfrog pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-horaedb-proto.git
The following commit(s) were added to refs/heads/main by this push:
new 4a6f323 build: upgrae protoc and grpc toolchain (#126)
4a6f323 is described below
commit 4a6f323b892c5944acdcf5447a3cc1e0c18f6e16
Author: tison <[email protected]>
AuthorDate: Thu Jan 4 19:55:49 2024 +0800
build: upgrae protoc and grpc toolchain (#126)
Signed-off-by: tison <[email protected]>
---
.github/workflows/ci.yml | 16 +++--
.github/workflows/release-rust.yml | 35 ---------
README.md | 2 +-
generate-go.sh | 2 +
golang/pkg/clusterpb/cluster.pb.go | 2 +-
golang/pkg/commonpb/common.pb.go | 2 +-
golang/pkg/horaeprompb/prometheus.pb.go | 2 +-
golang/pkg/metaeventpb/meta_event.pb.go | 2 +-
golang/pkg/metaeventpb/meta_event_grpc.pb.go | 2 +-
golang/pkg/metaservicepb/meta_service.pb.go | 2 +-
golang/pkg/metaservicepb/meta_service_grpc.pb.go | 2 +-
golang/pkg/metastoragepb/meta_storage.pb.go | 2 +-
golang/pkg/storagepb/storage.pb.go | 2 +-
golang/pkg/storagepb/storage_grpc.pb.go | 2 +-
java/pom.xml | 91 +++++++-----------------
15 files changed, 49 insertions(+), 117 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3e52b70..e07c107 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,18 +35,22 @@ jobs:
check-path: 'protos'
fallback-style: 'google'
- name: Install Protoc
- uses: arduino/setup-protoc@v1
+ uses: arduino/setup-protoc@v2
with:
- version: "3.20.1"
+ version: "25.1"
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '8'
cache: maven
- - name: Ensure Golang generated identical
- run: make go && git diff --exit-code
- - name: Ensure Rust crate compiled
+ - name: Check Golang package
+ run: |
+ # Check generated files identical
+ make go && git diff --exit-code
+ # Check Golang package compile
+ pushd golang && go build ./... && popd
+ - name: Check Rust crate
run: make rust
- - name: Ensure Java library compiled
+ - name: Check Java library
run: make java
diff --git a/.github/workflows/release-rust.yml
b/.github/workflows/release-rust.yml
deleted file mode 100644
index 241b036..0000000
--- a/.github/workflows/release-rust.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: Release Rust
-
-on:
- workflow_dispatch:
- push:
- tags:
- - 'v*'
-
-jobs:
- publish:
- name: Publish
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v4
- - name: Release Rust crate
- run: cargo publish
- env:
- CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
diff --git a/README.md b/README.md
index eea56f6..7a86c3e 100644
--- a/README.md
+++ b/README.md
@@ -47,5 +47,5 @@ As for the Rust projects that depends on this project,
everything will be genera
### Golang
-1. Install [Protocol Buffers
v3.20.1](https://github.com/protocolbuffers/protobuf/releases/tag/v3.20.1)
compiler.
+1. Install [Protocol Buffers
v25.1](https://github.com/protocolbuffers/protobuf/releases/tag/v25.1) compiler.
2. Execute `make go`.
diff --git a/generate-go.sh b/generate-go.sh
index 06544a8..0effa5c 100755
--- a/generate-go.sh
+++ b/generate-go.sh
@@ -23,6 +23,8 @@ ROOT_DIR=$( dirname "$0" )
GO_DIR="${ROOT_DIR}/golang"
GO_PREFIX_PATH="${GO_DIR}/github.com/apache/incubator-horaedb-proto/golang"
+export PATH="$(go env GOPATH)/bin:$PATH"
+
protoc --proto_path=./protos --go_out="$GO_DIR" --go-grpc_out="$GO_DIR" \
./protos/cluster.proto \
./protos/common.proto \
diff --git a/golang/pkg/clusterpb/cluster.pb.go
b/golang/pkg/clusterpb/cluster.pb.go
index e619230..66efbd3 100644
--- a/golang/pkg/clusterpb/cluster.pb.go
+++ b/golang/pkg/clusterpb/cluster.pb.go
@@ -19,7 +19,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
-// protoc v3.20.1
+// protoc v4.25.1
// source: cluster.proto
package clusterpb
diff --git a/golang/pkg/commonpb/common.pb.go b/golang/pkg/commonpb/common.pb.go
index c717cbd..0671960 100644
--- a/golang/pkg/commonpb/common.pb.go
+++ b/golang/pkg/commonpb/common.pb.go
@@ -19,7 +19,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
-// protoc v3.20.1
+// protoc v4.25.1
// source: common.proto
package commonpb
diff --git a/golang/pkg/horaeprompb/prometheus.pb.go
b/golang/pkg/horaeprompb/prometheus.pb.go
index 0257421..2d131ee 100644
--- a/golang/pkg/horaeprompb/prometheus.pb.go
+++ b/golang/pkg/horaeprompb/prometheus.pb.go
@@ -19,7 +19,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
-// protoc v3.20.1
+// protoc v4.25.1
// source: prometheus.proto
package horaeprompb
diff --git a/golang/pkg/metaeventpb/meta_event.pb.go
b/golang/pkg/metaeventpb/meta_event.pb.go
index c9c3f68..7f6ef9b 100644
--- a/golang/pkg/metaeventpb/meta_event.pb.go
+++ b/golang/pkg/metaeventpb/meta_event.pb.go
@@ -19,7 +19,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
-// protoc v3.20.1
+// protoc v4.25.1
// source: meta_event.proto
package metaeventpb
diff --git a/golang/pkg/metaeventpb/meta_event_grpc.pb.go
b/golang/pkg/metaeventpb/meta_event_grpc.pb.go
index b5efd90..091c9f0 100644
--- a/golang/pkg/metaeventpb/meta_event_grpc.pb.go
+++ b/golang/pkg/metaeventpb/meta_event_grpc.pb.go
@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.2.0
-// - protoc v3.20.1
+// - protoc v4.25.1
// source: meta_event.proto
package metaeventpb
diff --git a/golang/pkg/metaservicepb/meta_service.pb.go
b/golang/pkg/metaservicepb/meta_service.pb.go
index 90e91b3..0b44aaa 100644
--- a/golang/pkg/metaservicepb/meta_service.pb.go
+++ b/golang/pkg/metaservicepb/meta_service.pb.go
@@ -19,7 +19,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
-// protoc v3.20.1
+// protoc v4.25.1
// source: meta_service.proto
package metaservicepb
diff --git a/golang/pkg/metaservicepb/meta_service_grpc.pb.go
b/golang/pkg/metaservicepb/meta_service_grpc.pb.go
index c01e20f..d837409 100644
--- a/golang/pkg/metaservicepb/meta_service_grpc.pb.go
+++ b/golang/pkg/metaservicepb/meta_service_grpc.pb.go
@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.2.0
-// - protoc v3.20.1
+// - protoc v4.25.1
// source: meta_service.proto
package metaservicepb
diff --git a/golang/pkg/metastoragepb/meta_storage.pb.go
b/golang/pkg/metastoragepb/meta_storage.pb.go
index 5324c7c..f2c9eae 100644
--- a/golang/pkg/metastoragepb/meta_storage.pb.go
+++ b/golang/pkg/metastoragepb/meta_storage.pb.go
@@ -19,7 +19,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
-// protoc v3.20.1
+// protoc v4.25.1
// source: meta_storage.proto
package metastoragepb
diff --git a/golang/pkg/storagepb/storage.pb.go
b/golang/pkg/storagepb/storage.pb.go
index 155c107..29886f5 100644
--- a/golang/pkg/storagepb/storage.pb.go
+++ b/golang/pkg/storagepb/storage.pb.go
@@ -19,7 +19,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.28.1
-// protoc v3.20.1
+// protoc v4.25.1
// source: storage.proto
package storagepb
diff --git a/golang/pkg/storagepb/storage_grpc.pb.go
b/golang/pkg/storagepb/storage_grpc.pb.go
index d578bb3..dae2807 100644
--- a/golang/pkg/storagepb/storage_grpc.pb.go
+++ b/golang/pkg/storagepb/storage_grpc.pb.go
@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.2.0
-// - protoc v3.20.1
+// - protoc v4.25.1
// source: storage.proto
package storagepb
diff --git a/java/pom.xml b/java/pom.xml
index f52b8e2..e518347 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -23,23 +23,23 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>29</version>
+ <groupId>org.apache</groupId>
+ <version>31</version>
</parent>
<groupId>org.apache.horaedb</groupId>
<artifactId>horaedb-proto-internal</artifactId>
<version>2.0.0</version>
+ <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>
</license>
</licenses>
-
- <url>https://horaedb.apache.org</url>
<mailingLists>
<mailingList>
<name>Develop List</name>
@@ -50,45 +50,42 @@
</mailingList>
</mailingLists>
+ <scm>
+ <url>https://github.com/apache/incubator-horaedb-proto.git</url>
+
<connection>scm:git:https://gitbox.apache.org/repos/asf/incubator-horaedb-proto.git</connection>
+
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/incubator-horaedb-proto.git</developerConnection>
+ </scm>
+
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<project.encoding>UTF-8</project.encoding>
- <io.grpc.version>1.23.0</io.grpc.version>
- <junit.version>4.13.1</junit.version>
- <protobuf.version>3.20.1</protobuf.version>
+ <grpc.version>1.58.0</grpc.version>
+ <javax-annotation-api.version>1.3.2</javax-annotation-api.version>
+ <protobuf.version>3.25.1</protobuf.version>
</properties>
<dependencies>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-all</artifactId>
- <version>${io.grpc.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>netty-codec-http2</artifactId>
- <groupId>io.netty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>netty-handler-proxy</artifactId>
- <groupId>io.netty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-protobuf</artifactId>
+ <version>${grpc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-stub</artifactId>
+ <version>${grpc.version}</version>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
+ <version>${javax-annotation-api.version}</version>
</dependency>
</dependencies>
@@ -97,10 +94,9 @@
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
- <version>1.4.1.Final</version>
+ <version>1.7.1</version>
</extension>
</extensions>
- <finalName>horaedb-proto-internal</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -114,41 +110,6 @@
<showWarnings>true</showWarnings>
</configuration>
</plugin>
- <!-- sort pom -->
- <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>
- <!-- Source -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <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>
@@ -164,7 +125,7 @@
<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>
+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
<protoSourceRoot>${project.basedir}/../protos</protoSourceRoot>
<outputDirectory>${project.basedir}/src/main/java</outputDirectory>
<clearOutputDirectory>false</clearOutputDirectory>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
