sijie closed pull request #2279: [build] pin protobuf-shaded version
URL: https://github.com/apache/incubator-pulsar/pull/2279
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/pom.xml b/pom.xml
index 30aedf603f..b0c8b2aad3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,6 @@ flexible messaging model and an intuitive client
API.</description>
<module>pulsar-client-kafka-compat</module>
<module>pulsar-zookeeper</module>
<module>pulsar-log4j2-appender</module>
- <module>protobuf-shaded</module>
<!-- jclouds shaded for gson conflict:
https://issues.apache.org/jira/browse/JCLOUDS-1166 -->
<module>jclouds-shaded</module>
@@ -127,6 +126,9 @@ flexible messaging model and an intuitive client
API.</description>
<testRealAWS>false</testRealAWS>
<testRetryCount>1</testRetryCount>
+ <!-- pin the protobuf-shaded version to make the pulsar build friendly to
intellij -->
+
<pulsar.protobuf.shaded.version>2.1.0-incubating</pulsar.protobuf.shaded.version>
+
<!-- apache commons -->
<commons-compress.version>1.15</commons-compress.version>
diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
index 296799ce0e..8e5d3d3d7f 100644
--- a/pulsar-broker/pom.xml
+++ b/pulsar-broker/pom.xml
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>protobuf-shaded</artifactId>
- <version>${project.version}</version>
+ <version>${pulsar.protobuf.shaded.version}</version>
</dependency>
<dependency>
diff --git a/pulsar-common/pom.xml b/pulsar-common/pom.xml
index 4ba63e995a..8a7d275b19 100644
--- a/pulsar-common/pom.xml
+++ b/pulsar-common/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>protobuf-shaded</artifactId>
- <version>${project.version}</version>
+ <version>${pulsar.protobuf.shaded.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.protobuf</groupId>
diff --git a/pulsar-functions/utils/pom.xml b/pulsar-functions/utils/pom.xml
index a48e43fc49..42c88d88e1 100644
--- a/pulsar-functions/utils/pom.xml
+++ b/pulsar-functions/utils/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>protobuf-shaded</artifactId>
- <version>${project.version}</version>
+ <version>${pulsar.protobuf.shaded.version}</version>
</dependency>
<dependency>
diff --git a/pulsar-io/core/pom.xml b/pulsar-io/core/pom.xml
index 05307ce3b7..676e05f020 100644
--- a/pulsar-io/core/pom.xml
+++ b/pulsar-io/core/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>protobuf-shaded</artifactId>
- <version>${project.version}</version>
+ <version>${pulsar.protobuf.shaded.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.protobuf</groupId>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
