You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by si...@apache.org on 2018/08/02 17:37:31 UTC
[incubator-pulsar] branch master updated: [build] pin
protobuf-shaded version (#2279)
This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 651d4cd [build] pin protobuf-shaded version (#2279)
651d4cd is described below
commit 651d4cdd535652be55f39e1c1d04a0d59cc3ffde
Author: Sijie Guo <gu...@gmail.com>
AuthorDate: Thu Aug 2 10:37:29 2018 -0700
[build] pin protobuf-shaded version (#2279)
### Motivation
shading kills the development experiences in IDEs like intellij.
since protobuf-shaded is a module that is rarely changed, we should
pin the version of `protobuf-shaded` to make IDEs work well with
shaded depenencies
### Changes
Pin `protobuf-shaded` to `2.1.0-incubating`
---
pom.xml | 4 +++-
pulsar-broker/pom.xml | 2 +-
pulsar-common/pom.xml | 2 +-
pulsar-functions/utils/pom.xml | 2 +-
pulsar-io/core/pom.xml | 2 +-
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 30aedf6..b0c8b2a 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 296799c..8e5d3d3 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 4ba63e9..8a7d275 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 a48e43f..42c88d8 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 05307ce..676e05f 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>