You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celeborn.apache.org by zh...@apache.org on 2023/01/05 12:09:36 UTC
[incubator-celeborn] branch main updated: [CELEBORN-198] Fix the wrong configuration path of plugin protobuf-maven-plugin and … (#1146)
This is an automated email from the ASF dual-hosted git repository.
zhouky pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new ab449ffd [CELEBORN-198] Fix the wrong configuration path of plugin protobuf-maven-plugin and … (#1146)
ab449ffd is described below
commit ab449ffdd723de964b84ff4724589b7edfe59bce
Author: Fu Chen <cf...@gmail.com>
AuthorDate: Thu Jan 5 20:09:31 2023 +0800
[CELEBORN-198] Fix the wrong configuration path of plugin protobuf-maven-plugin and … (#1146)
---
common/pom.xml | 12 ++++++------
master/pom.xml | 12 ++++++------
pom.xml | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/common/pom.xml b/common/pom.xml
index e414262e..b1133882 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -144,6 +144,12 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>${maven.plugin.protobuf.version}</version>
<extensions>true</extensions>
+ <configuration>
+ <protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
+ <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
+ <pluginId>grpc-java</pluginId>
+ <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
+ </configuration>
<executions>
<execution>
<id>compile-protoc</id>
@@ -151,12 +157,6 @@
<goal>compile</goal>
<goal>compile-custom</goal>
</goals>
- <configuration>
- <protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
- <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
- <pluginId>grpc-java</pluginId>
- <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/master/pom.xml b/master/pom.xml
index 7f9b5fed..871bd963 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -103,6 +103,12 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>${maven.plugin.protobuf.version}</version>
<extensions>true</extensions>
+ <configuration>
+ <protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
+ <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
+ <pluginId>grpc-java</pluginId>
+ <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
+ </configuration>
<executions>
<execution>
<id>compile-protoc</id>
@@ -110,12 +116,6 @@
<goal>compile</goal>
<goal>compile-custom</goal>
</goals>
- <configuration>
- <protoSourceRoot>${basedir}/src/main/proto/</protoSourceRoot>
- <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
- <pluginId>grpc-java</pluginId>
- <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/pom.xml b/pom.xml
index 9422e4af..494b8d3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@
<maven.plugin.jacoco.version>0.8.7</maven.plugin.jacoco.version>
<maven.plugin.jar.version>3.0.2</maven.plugin.jar.version>
<maven.plugin.os.version>1.7.0</maven.plugin.os.version>
- <maven.plugin.protobuf.version>0.5.1</maven.plugin.protobuf.version>
+ <maven.plugin.protobuf.version>0.6.1</maven.plugin.protobuf.version>
<maven.plugin.rat.version>0.13</maven.plugin.rat.version>
<maven.plugin.scala.version>4.7.2</maven.plugin.scala.version>
<maven.plugin.scalatest.version>2.1.0</maven.plugin.scalatest.version>